codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
jxxghp
2023-06-24 16:21:26 +08:00
parent eb37e66a5e a16b9b39d9
commit 4387c43014
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/filetransfer/__init__.py
View File

@ -54,7 +54,7 @@ class FileTransferModule(_ModuleBase):
target_path=target_path, target_path=target_path,
message=msg, message=msg,
file_count=file_count, file_count=file_count,
file_size=file_size, total_size=file_size,
fail_list=fail_list) fail_list=fail_list)
@staticmethod @staticmethod
@ -389,7 +389,7 @@ class FileTransferModule(_ModuleBase):
# 计算大小 # 计算大小
total_filesize += in_path.stat().st_size total_filesize += in_path.stat().st_size
# 返回转移后的路径 # 返回转移后的路径
return new_path, total_filesize, total_filesize, [], "" return new_path, total_num, total_filesize, [], ""
else: else:
# 获取文件清单 # 获取文件清单
transfer_files: List[Path] = SystemUtils.list_files_with_extensions(in_path, settings.RMT_MEDIAEXT) transfer_files: List[Path] = SystemUtils.list_files_with_extensions(in_path, settings.RMT_MEDIAEXT)
@ -454,7 +454,7 @@ class FileTransferModule(_ModuleBase):
# 计算文件数 # 计算文件数
total_num += 1 total_num += 1
# 计算大小 # 计算大小
total_filesize += transfer_file.stat().st_size total_filesize += new_file.stat().st_size
except Exception as err: except Exception as err:
err_msgs.append(f"{transfer_file.name}：{err}") err_msgs.append(f"{transfer_file.name}：{err}")
logger.error(f"{transfer_file}转移失败：{err}") logger.error(f"{transfer_file}转移失败：{err}")

2
app/modules/subtitle/__init__.py
View File

@ -62,7 +62,7 @@ class SubtitleModule(_ModuleBase):
if download_dir.is_file(): if download_dir.is_file():
download_dir = download_dir.parent download_dir = download_dir.parent
# 读取网站代码 # 读取网站代码
request = RequestUtils(cookies=torrent.site_cookie, headers=torrent.site_ua) request = RequestUtils(cookies=torrent.site_cookie, ua=torrent.site_ua)
res = request.get_res(torrent.page_url) res = request.get_res(torrent.page_url)
if res and res.status_code == 200: if res and res.status_code == 200:
if not res.text: if not res.text:

2
app/modules/telegram/telegram.py
View File

@ -52,7 +52,7 @@ class Telegram(metaclass=Singleton):
定义线程函数来运行 infinity_polling 定义线程函数来运行 infinity_polling
""" """
try: try:
_bot.infinity_polling(long_polling_timeout=5) _bot.infinity_polling(long_polling_timeout=10)
except Exception as err: except Exception as err:
logger.error(f"Telegram消息接收服务异常：{err}") logger.error(f"Telegram消息接收服务异常：{err}")