mirror of
https://gitee.com/g1879/DrissionPage.git
synced 2024-12-12 12:25:19 +08:00
download()增加retry，未完成
This commit is contained in:
g1879
parent
1cab918598
commit
7fcde1a67d
@ -310,6 +310,8 @@ class SessionPage(object):
|
||||
post_data: dict = None,
|
||||
show_msg: bool = False,
|
||||
show_errmsg: bool = False,
|
||||
retry: int = None,
|
||||
interval: float = None,
|
||||
**kwargs) -> tuple:
|
||||
"""下载一个文件 \n
|
||||
:param file_url: 文件url
|
||||
@ -319,32 +321,42 @@ class SessionPage(object):
|
||||
:param post_data: post方式的数据
|
||||
:param show_msg: 是否显示下载信息
|
||||
:param show_errmsg: 是否抛出和显示异常
|
||||
:param retry: 重试次数
|
||||
:param interval: 重试间隔时间
|
||||
:param kwargs: 连接参数
|
||||
:return: 下载是否成功（bool）和状态信息（成功时信息为文件路径）的元组
|
||||
"""
|
||||
# 生成的response不写入self._response，是临时的
|
||||
if file_exists == 'skip' and Path(f'{goal_path}\\{rename}').exists():
|
||||
if show_msg:
|
||||
print(f'{file_url}\n{goal_path}\\{rename}\nSkipped.\n')
|
||||
|
||||
return False, 'Skipped because a file with the same name already exists.'
|
||||
|
||||
kwargs['stream'] = True
|
||||
def do(url: str,
|
||||
goal: str,
|
||||
new_name: str = None,
|
||||
exists: str = 'rename',
|
||||
data: dict = None,
|
||||
msg: bool = False,
|
||||
errmsg: bool = False,
|
||||
**args) -> tuple:
|
||||
args['stream'] = True
|
||||
|
||||
if 'timeout' not in kwargs:
|
||||
kwargs['timeout'] = 20
|
||||
if 'timeout' not in args:
|
||||
args['timeout'] = 20
|
||||
|
||||
mode = 'post' if post_data else 'get'
|
||||
r, info = self._make_response(file_url, mode=mode, data=post_data, show_errmsg=show_errmsg, **kwargs)
|
||||
mode = 'post' if data else 'get'
|
||||
# 生成的response不写入self._response，是临时的
|
||||
r, info = self._make_response(url, mode=mode, data=data, show_errmsg=errmsg, **args)
|
||||
|
||||
if r is None:
|
||||
if show_msg:
|
||||
if msg:
|
||||
print(info)
|
||||
|
||||
return False, info
|
||||
|
||||
if not r.ok:
|
||||
if show_errmsg:
|
||||
if errmsg:
|
||||
raise ConnectionError(f'Status code: {r.status_code}.')
|
||||
|
||||
return False, f'Status code: {r.status_code}.'
|
||||
@ -357,6 +369,7 @@ class SessionPage(object):
|
||||
if content_disposition:
|
||||
file_name = r.headers[content_disposition[0]].encode('ISO-8859-1').decode('utf-8')
|
||||
file_name = re.search(r'filename *= *"?([^";]+)', file_name)
|
||||
|
||||
if file_name:
|
||||
file_name = file_name.group(1)
|
||||
|
||||
@ -364,8 +377,8 @@ class SessionPage(object):
|
||||
file_name = file_name[1:-1]
|
||||
|
||||
# 在url里获取文件名
|
||||
if not file_name and os_PATH.basename(file_url):
|
||||
file_name = os_PATH.basename(file_url).split("?")[0]
|
||||
if not file_name and os_PATH.basename(url):
|
||||
file_name = os_PATH.basename(url).split("?")[0]
|
||||
|
||||
# 找不到则用时间和随机数生成文件名
|
||||
if not file_name:
|
||||
@ -376,50 +389,50 @@ class SessionPage(object):
|
||||
file_name = unquote(file_name)
|
||||
|
||||
# -------------------重命名，不改变扩展名-------------------
|
||||
if rename:
|
||||
rename = re_SUB(r'[\\/*:|<>?"]', '', rename).strip()
|
||||
if new_name:
|
||||
new_name = re_SUB(r'[\\/*:|<>?"]', '', new_name).strip()
|
||||
ext_name = file_name.split('.')[-1]
|
||||
|
||||
if '.' in rename or ext_name == file_name:
|
||||
full_name = rename
|
||||
if '.' in new_name or ext_name == file_name:
|
||||
full_name = new_name
|
||||
else:
|
||||
full_name = f'{rename}.{ext_name}'
|
||||
full_name = f'{new_name}.{ext_name}'
|
||||
|
||||
else:
|
||||
full_name = file_name
|
||||
|
||||
# -------------------生成路径-------------------
|
||||
goal_Path = Path(goal_path)
|
||||
goal_path = ''
|
||||
goal_Path = Path(goal)
|
||||
goal = ''
|
||||
skip = False
|
||||
|
||||
for key, i in enumerate(goal_Path.parts): # 去除路径中的非法字符
|
||||
goal_path += goal_Path.drive if key == 0 and goal_Path.drive else re_SUB(r'[*:|<>?"]', '', i).strip()
|
||||
goal_path += '\\' if i != '\\' and key < len(goal_Path.parts) - 1 else ''
|
||||
goal += goal_Path.drive if key == 0 and goal_Path.drive else re_SUB(r'[*:|<>?"]', '', i).strip()
|
||||
goal += '\\' if i != '\\' and key < len(goal_Path.parts) - 1 else ''
|
||||
|
||||
goal_Path = Path(goal_path).absolute()
|
||||
goal_Path = Path(goal).absolute()
|
||||
goal_Path.mkdir(parents=True, exist_ok=True)
|
||||
full_path = Path(f'{goal_path}\\{full_name}')
|
||||
full_path = Path(f'{goal}\\{full_name}')
|
||||
|
||||
if full_path.exists():
|
||||
if file_exists == 'rename':
|
||||
full_name = get_available_file_name(goal_path, full_name)
|
||||
full_path = Path(f'{goal_path}\\{full_name}')
|
||||
full_name = get_available_file_name(goal, full_name)
|
||||
full_path = Path(f'{goal}\\{full_name}')
|
||||
|
||||
elif file_exists == 'skip':
|
||||
elif exists == 'skip':
|
||||
skip = True
|
||||
|
||||
elif file_exists == 'overwrite':
|
||||
elif exists == 'overwrite':
|
||||
pass
|
||||
|
||||
else:
|
||||
raise ValueError("Argument file_exists can only be 'skip', 'overwrite', 'rename'.")
|
||||
|
||||
# -------------------打印要下载的文件-------------------
|
||||
if show_msg:
|
||||
if msg:
|
||||
print(file_url)
|
||||
print(full_name if file_name == full_name else f'{file_name} -> {full_name}')
|
||||
print(f'Downloading to: {goal_path}')
|
||||
print(f'Downloading to: {goal}')
|
||||
|
||||
if skip:
|
||||
print('Skipped.\n')
|
||||
@ -442,20 +455,20 @@ class SessionPage(object):
|
||||
tmpFile.write(chunk)
|
||||
|
||||
# 如表头有返回文件大小，显示进度
|
||||
if show_msg and file_size:
|
||||
if msg and file_size:
|
||||
downloaded_size += 1024
|
||||
rate = downloaded_size / file_size if downloaded_size < file_size else 1
|
||||
print('\r {:.0%} '.format(rate), end="")
|
||||
|
||||
except Exception as e:
|
||||
if show_errmsg:
|
||||
if errmsg:
|
||||
raise ConnectionError(e)
|
||||
|
||||
download_status, info = False, f'Download failed.\n{e}'
|
||||
|
||||
else:
|
||||
if full_path.stat().st_size == 0:
|
||||
if show_errmsg:
|
||||
if errmsg:
|
||||
raise ValueError('File size is 0.')
|
||||
|
||||
download_status, info = False, 'File size is 0.'
|
||||
@ -471,12 +484,27 @@ class SessionPage(object):
|
||||
r.close()
|
||||
|
||||
# -------------------显示并返回值-------------------
|
||||
if show_msg:
|
||||
if msg:
|
||||
print(info, '\n')
|
||||
|
||||
info = f'{goal_path}\\{full_name}' if download_status else info
|
||||
info = f'{goal}\\{full_name}' if download_status else info
|
||||
return download_status, info
|
||||
|
||||
retry_times = retry or self.retry_times
|
||||
retry_interval = interval or self.retry_interval
|
||||
result = do(file_url, goal_path, rename, file_exists, post_data, show_msg, show_errmsg, **kwargs)
|
||||
|
||||
if not result[0] and not str(result[1]).startswith('Skipped'):
|
||||
for i in range(retry_times):
|
||||
sleep(retry_interval)
|
||||
|
||||
print(f'重试 {file_url}')
|
||||
result = do(file_url, goal_path, rename, file_exists, post_data, show_msg, show_errmsg, **kwargs)
|
||||
if result[0]:
|
||||
break
|
||||
|
||||
return result
|
||||
|
||||
def _make_response(self,
|
||||
url: str,
|
||||
mode: str = 'get',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user