bacow/AV_Data_Capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Yoshiko2
2022-05-28 16:18:54 +08:00
committed by GitHub
parent 9f6322494f 99cc99bb51
commit a3b36eec44
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ADC_function.py
View File

@@ -470,15 +470,12 @@ def download_file_with_filename(url: str, filename: str, path: str) -> None:
except: except:
print(f"[-]Fatal error! Can not make folder '{path}'") print(f"[-]Fatal error! Can not make folder '{path}'")
os._exit(0) os._exit(0)
proxies = configProxy.proxies() r = get_html(url=url, return_type='content')
headers = {
'User-Agent': G_USER_AGENT}
r = requests.get(url, headers=headers, timeout=configProxy.timeout, proxies=proxies)
if r == '': if r == '':
print('[-]Movie Download Data not found!') print('[-]Movie Download Data not found!')
return return
with open(os.path.join(path, filename), "wb") as code: with open(os.path.join(path, filename), "wb") as code:
code.write(r.content) code.write(r)
return return
else: else:
if not os.path.exists(path): if not os.path.exists(path):
@@ -487,14 +484,12 @@ def download_file_with_filename(url: str, filename: str, path: str) -> None:
except: except:
print(f"[-]Fatal error! Can not make folder '{path}'") print(f"[-]Fatal error! Can not make folder '{path}'")
os._exit(0) os._exit(0)
headers = { r = get_html(url=url, return_type='content')
'User-Agent': G_USER_AGENT}
r = requests.get(url, timeout=configProxy.timeout, headers=headers)
if r == '': if r == '':
print('[-]Movie Download Data not found!') print('[-]Movie Download Data not found!')
return return
with open(os.path.join(path, filename), "wb") as code: with open(os.path.join(path, filename), "wb") as code:
code.write(r.content) code.write(r)
return return
except requests.exceptions.RequestException: except requests.exceptions.RequestException:
i += 1 i += 1

12
core.py
View File

@@ -128,20 +128,12 @@ def download_file_with_filename(url, filename, path, filepath, json_headers=None
except: except:
print(f"[-]Fatal error! Can not make folder '{path}'") print(f"[-]Fatal error! Can not make folder '{path}'")
os._exit(0) os._exit(0)
headers = {'User-Agent': G_USER_AGENT} r = get_html(url=url,return_type='content',json_headers=json_headers)
if not json_headers == None:
if 'headers' in json_headers:
headers.update(json_headers)
if configProxy.enable:
proxies = configProxy.proxies()
r = requests.get(url, headers=headers, timeout=configProxy.timeout, proxies=proxies)
else:
r = requests.get(url, headers=headers, timeout=configProxy.timeout)
if r == '': if r == '':
print('[-]Movie Download Data not found!') print('[-]Movie Download Data not found!')
return return
with open(os.path.join(path, filename), "wb") as code: with open(os.path.join(path, filename), "wb") as code:
code.write(r.content) code.write(r)
return return
except requests.exceptions.ProxyError: except requests.exceptions.ProxyError:
i += 1 i += 1