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

fix

Browse Source
This commit is contained in:
jxxghp
2023-10-18 19:26:21 +08:00
parent 2e4536edb6
commit 3d34c26731
55 changed files with 142 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,5 +530,5 @@ class DoubanModule(_ModuleBase):
file_path=file,
transfer_type=transfer_type)
except Exception as e:
logger.error(f"刮削文件 {file} 失败，原因：{e}")
logger.error(f"刮削文件 {file} 失败，原因：{str(e)}")
logger.info(f"{path} 刮削完成")

4
app/modules/douban/scraper.py
View File

@ -57,7 +57,7 @@ class DoubanScraper:
season=meta.begin_season,
season_path=file_path.parent)
except Exception as e:
logger.error(f"{file_path} 刮削失败：{e}")
logger.error(f"{file_path} 刮削失败：{str(e)}")
@staticmethod
def __gen_common_nfo(mediainfo: MediaInfo, doc, root):
@ -187,7 +187,7 @@ class DoubanScraper:
else:
logger.info(f"{file_path.stem}图片下载失败，请检查网络连通性")
except Exception as err:
logger.error(f"{file_path.stem}图片下载失败：{err}")
logger.error(f"{file_path.stem}图片下载失败：{str(err)}")
def __save_nfo(self, doc, file_path: Path):
"""

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

@ -382,5 +382,5 @@ class FanartModule(_ModuleBase):
if ret:
return ret.json()
except Exception as err:
logger.error(f"获取{queryid}的Fanart图片失败：{err}")
logger.error(f"获取{queryid}的Fanart图片失败：{str(err)}")
return None

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

@ -590,7 +590,7 @@ class FileTransferModule(_ModuleBase):
if path.is_relative_to(libpath):
return libpath
except Exception as e:
logger.debug(f"计算媒体库路径时出错：{e}")
logger.debug(f"计算媒体库路径时出错：{str(e)}")
continue
return path
@ -618,7 +618,7 @@ class FileTransferModule(_ModuleBase):
max_length = len(relative)
target_path = path
except Exception as e:
logger.debug(f"计算目标路径时出错：{e}")
logger.debug(f"计算目标路径时出错：{str(e)}")
continue
if target_path:
return target_path

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

@ -92,7 +92,7 @@ class IndexerModule(_ModuleBase):
if result_array:
break
except Exception as err:
logger.error(f"{site.get('name')} 搜索出错：{err}")
logger.error(f"{site.get('name')} 搜索出错：{str(err)}")
# 索引花费的时间
seconds = round((datetime.now() - start_time).seconds, 1)

4
app/modules/indexer/spider.py
View File

@ -254,7 +254,7 @@ class TorrentSpider:
# 解码为字符串
page_source = raw_data.decode(encoding)
except Exception as e:
logger.debug(f"chardet解码失败：{e}")
logger.debug(f"chardet解码失败：{str(e)}")
# 探测utf-8解码
if re.search(r"charset=\"?utf-8\"?", ret.text, re.IGNORECASE):
ret.encoding = "utf-8"
@ -661,4 +661,4 @@ class TorrentSpider:
return self.torrents_info_array
except Exception as err:
self.is_error = True
logger.warn(f"错误：{self.indexername} {err}")
logger.warn(f"错误：{self.indexername} {str(err)}")

6
app/modules/plex/plex.py
View File

@ -284,7 +284,7 @@ class Plex(metaclass=Singleton):
if is_subpath(path, Path(location)):
return lib.key, str(path)
except Exception as err:
logger.error(f"查找媒体库出错：{err}")
logger.error(f"查找媒体库出错：{str(err)}")
return "", ""
def get_iteminfo(self, itemid: str) -> Optional[schemas.MediaServerItem]:
@ -313,7 +313,7 @@ class Plex(metaclass=Singleton):
path=path,
)
except Exception as err:
logger.error(f"获取项目详情出错：{err}")
logger.error(f"获取项目详情出错：{str(err)}")
return None
@staticmethod
@ -372,7 +372,7 @@ class Plex(metaclass=Singleton):
path=path,
)
except Exception as err:
logger.error(f"获取媒体库列表出错：{err}")
logger.error(f"获取媒体库列表出错：{str(err)}")
yield None
def get_webhook_message(self, form: any) -> Optional[schemas.WebhookEventInfo]:

34
app/modules/qbittorrent/qbittorrent.py
View File

@ -57,10 +57,10 @@ class Qbittorrent(metaclass=Singleton):
try:
qbt.auth_log_in()
except qbittorrentapi.LoginFailed as e:
logger.error(f"qbittorrent 登录失败：{e}")
logger.error(f"qbittorrent 登录失败：{str(e)}")
return qbt
except Exception as err:
logger.error(f"qbittorrent 连接出错：{err}")
logger.error(f"qbittorrent 连接出错：{str(err)}")
return None
def get_torrents(self, ids: Union[str, list] = None,
@ -86,7 +86,7 @@ class Qbittorrent(metaclass=Singleton):
return results, False
return torrents or [], False
except Exception as err:
logger.error(f"获取种子列表出错：{err}")
logger.error(f"获取种子列表出错：{str(err)}")
return [], True
def get_completed_torrents(self, ids: Union[str, list] = None,
@ -126,7 +126,7 @@ class Qbittorrent(metaclass=Singleton):
self.qbc.torrents_delete_tags(torrent_hashes=ids, tags=tag)
return True
except Exception as err:
logger.error(f"移除种子Tag出错：{err}")
logger.error(f"移除种子Tag出错：{str(err)}")
return False
def set_torrents_tag(self, ids: Union[str, list], tags: list):
@ -139,7 +139,7 @@ class Qbittorrent(metaclass=Singleton):
# 打标签
self.qbc.torrents_add_tags(tags=tags, torrent_hashes=ids)
except Exception as err:
logger.error(f"设置种子Tag出错：{err}")
logger.error(f"设置种子Tag出错：{str(err)}")
def torrents_set_force_start(self, ids: Union[str, list]):
"""
@ -150,7 +150,7 @@ class Qbittorrent(metaclass=Singleton):
try:
self.qbc.torrents_set_force_start(enable=True, torrent_hashes=ids)
except Exception as err:
logger.error(f"设置强制作种出错：{err}")
logger.error(f"设置强制作种出错：{str(err)}")
def __get_last_add_torrentid_by_tag(self, tags: Union[str, list],
status: Union[str, list] = None) -> Optional[str]:
@ -161,7 +161,7 @@ class Qbittorrent(metaclass=Singleton):
try:
torrents, _ = self.get_torrents(status=status, tags=tags)
except Exception as err:
logger.error(f"获取种子列表出错：{err}")
logger.error(f"获取种子列表出错：{str(err)}")
return None
if torrents:
return torrents[0].get("hash")
@ -249,7 +249,7 @@ class Qbittorrent(metaclass=Singleton):
**kwargs)
return True if qbc_ret and str(qbc_ret).find("Ok") != -1 else False
except Exception as err:
logger.error(f"添加种子出错：{err}")
logger.error(f"添加种子出错：{str(err)}")
return False
def start_torrents(self, ids: Union[str, list]) -> bool:
@ -262,7 +262,7 @@ class Qbittorrent(metaclass=Singleton):
self.qbc.torrents_resume(torrent_hashes=ids)
return True
except Exception as err:
logger.error(f"启动种子出错：{err}")
logger.error(f"启动种子出错：{str(err)}")
return False
def stop_torrents(self, ids: Union[str, list]) -> bool:
@ -275,7 +275,7 @@ class Qbittorrent(metaclass=Singleton):
self.qbc.torrents_pause(torrent_hashes=ids)
return True
except Exception as err:
logger.error(f"暂停种子出错：{err}")
logger.error(f"暂停种子出错：{str(err)}")
return False
def delete_torrents(self, delete_file: bool, ids: Union[str, list]) -> bool:
@ -290,7 +290,7 @@ class Qbittorrent(metaclass=Singleton):
self.qbc.torrents_delete(delete_files=delete_file, torrent_hashes=ids)
return True
except Exception as err:
logger.error(f"删除种子出错：{err}")
logger.error(f"删除种子出错：{str(err)}")
return False
def get_files(self, tid: str) -> Optional[TorrentFilesList]:
@ -302,7 +302,7 @@ class Qbittorrent(metaclass=Singleton):
try:
return self.qbc.torrents_files(torrent_hash=tid)
except Exception as err:
logger.error(f"获取种子文件列表出错：{err}")
logger.error(f"获取种子文件列表出错：{str(err)}")
return None
def set_files(self, **kwargs) -> bool:
@ -319,7 +319,7 @@ class Qbittorrent(metaclass=Singleton):
priority=kwargs.get("priority"))
return True
except Exception as err:
logger.error(f"设置种子文件状态出错：{err}")
logger.error(f"设置种子文件状态出错：{str(err)}")
return False
def transfer_info(self) -> Optional[TransferInfoDictionary]:
@ -331,7 +331,7 @@ class Qbittorrent(metaclass=Singleton):
try:
return self.qbc.transfer_info()
except Exception as err:
logger.error(f"获取传输信息出错：{err}")
logger.error(f"获取传输信息出错：{str(err)}")
return None
def set_speed_limit(self, download_limit: float = None, upload_limit: float = None) -> bool:
@ -349,7 +349,7 @@ class Qbittorrent(metaclass=Singleton):
self.qbc.transfer.download_limit = int(download_limit)
return True
except Exception as err:
logger.error(f"设置速度限制出错：{err}")
logger.error(f"设置速度限制出错：{str(err)}")
return False
def recheck_torrents(self, ids: Union[str, list]):
@ -361,7 +361,7 @@ class Qbittorrent(metaclass=Singleton):
try:
return self.qbc.torrents_recheck(torrent_hashes=ids)
except Exception as err:
logger.error(f"重新校验种子出错：{err}")
logger.error(f"重新校验种子出错：{str(err)}")
return False
def add_trackers(self, ids: Union[str, list], trackers: list):
@ -373,5 +373,5 @@ class Qbittorrent(metaclass=Singleton):
try:
return self.qbc.torrents_add_trackers(torrent_hashes=ids, urls=trackers)
except Exception as err:
logger.error(f"添加tracker出错：{err}")
logger.error(f"添加tracker出错：{str(err)}")
return False

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

@ -151,7 +151,7 @@ class SlackModule(_ModuleBase):
try:
msg_json: dict = json.loads(body)
except Exception as err:
logger.debug(f"解析Slack消息失败：{err}")
logger.debug(f"解析Slack消息失败：{str(err)}")
return None
if msg_json:
if msg_json.get("type") == "message":

4
app/modules/slack/slack.py
View File

@ -34,7 +34,7 @@ class Slack:
ssl_check_enabled=False,
url_verification_enabled=False)
except Exception as err:
logger.error(f"Slack初始化失败: {err}")
logger.error(f"Slack初始化失败: {str(err)}")
return
self._client = slack_app.client
@ -335,5 +335,5 @@ class Slack:
conversation_id = channel.get("id")
break
except Exception as e:
logger.error(f"查找Slack公共频道失败: {e}")
logger.error(f"查找Slack公共频道失败: {str(e)}")
return conversation_id

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

@ -122,7 +122,7 @@ class SubtitleModule(_ModuleBase):
shutil.rmtree(zip_path)
zip_file.unlink()
except Exception as err:
logger.error(f"删除临时文件失败：{err}")
logger.error(f"删除临时文件失败：{str(err)}")
else:
sub_file = settings.TEMP_PATH / file_name
# 保存

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

@ -50,7 +50,7 @@ class SynologyChatModule(_ModuleBase):
return CommingMessage(channel=MessageChannel.SynologyChat,
userid=user_id, username=user_name, text=text)
except Exception as err:
logger.debug(f"解析SynologyChat消息失败：{err}")
logger.debug(f"解析SynologyChat消息失败：{str(err)}")
return None
@checkMessage(MessageChannel.SynologyChat)

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

@ -63,7 +63,7 @@ class TelegramModule(_ModuleBase):
try:
message: dict = json.loads(body)
except Exception as err:
logger.debug(f"解析Telegram消息失败：{err}")
logger.debug(f"解析Telegram消息失败：{str(err)}")
return None
if message:
text = message.get("text")

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

@ -54,7 +54,7 @@ class Telegram(metaclass=Singleton):
try:
_bot.infinity_polling(long_polling_timeout=30, logger_level=None)
except Exception as err:
logger.error(f"Telegram消息接收服务异常：{err}")
logger.error(f"Telegram消息接收服务异常：{str(err)}")
# 启动线程来运行 infinity_polling
self._polling_thread = threading.Thread(target=run_polling)

2
app/modules/themoviedb/category.py
View File

@ -32,7 +32,7 @@ class CategoryHelper(metaclass=Singleton):
logger.warn(f"二级分类策略配置文件格式出现严重错误！请检查：{str(e)}")
self._categorys = {}
except Exception as err:
logger.warn(f"二级分类策略配置文件加载出错：{err}")
logger.warn(f"二级分类策略配置文件加载出错：{str(err)}")
if self._categorys:
self._movie_categorys = self._categorys.get('movie')

4
app/modules/themoviedb/scraper.py
View File

@ -125,7 +125,7 @@ class TmdbScraper:
f"https://{settings.TMDB_IMAGE_DOMAIN}/t/p/original{episode_image}",
file_path.with_suffix(Path(episode_image).suffix))
except Exception as e:
logger.error(f"{file_path} 刮削失败：{e}")
logger.error(f"{file_path} 刮削失败：{str(e)}")
@staticmethod
def __gen_common_nfo(mediainfo: MediaInfo, doc, root):
@ -355,7 +355,7 @@ class TmdbScraper:
except RequestException as err:
raise err
except Exception as err:
logger.error(f"{file_path.stem}图片下载失败：{err}")
logger.error(f"{file_path.stem}图片下载失败：{str(err)}")
def __save_nfo(self, doc, file_path: Path):
"""

18
app/modules/themoviedb/tmdbapi.py
View File

@ -210,10 +210,10 @@ class TmdbHelper:
else:
movies = self.search.movies(term=name)
except TMDbException as err:
logger.error(f"连接TMDB出错：{err}")
logger.error(f"连接TMDB出错：{str(err)}")
return None
except Exception as e:
logger.error(f"连接TMDB出错：{e}")
logger.error(f"连接TMDB出错：{str(e)}")
print(traceback.print_exc())
return None
logger.debug(f"API返回：{str(self.search.total_results)}")
@ -258,10 +258,10 @@ class TmdbHelper:
else:
tvs = self.search.tv_shows(term=name)
except TMDbException as err:
logger.error(f"连接TMDB出错：{err}")
logger.error(f"连接TMDB出错：{str(err)}")
return None
except Exception as e:
logger.error(f"连接TMDB出错：{e}")
logger.error(f"连接TMDB出错：{str(e)}")
print(traceback.print_exc())
return None
logger.debug(f"API返回：{str(self.search.total_results)}")
@ -320,10 +320,10 @@ class TmdbHelper:
try:
tvs = self.search.tv_shows(term=name)
except TMDbException as err:
logger.error(f"连接TMDB出错：{err}")
logger.error(f"连接TMDB出错：{str(err)}")
return None
except Exception as e:
logger.error(f"连接TMDB出错：{e}")
logger.error(f"连接TMDB出错：{str(e)}")
print(traceback.print_exc())
return None
@ -400,10 +400,10 @@ class TmdbHelper:
try:
multis = self.search.multi(term=name) or []
except TMDbException as err:
logger.error(f"连接TMDB出错：{err}")
logger.error(f"连接TMDB出错：{str(err)}")
return None
except Exception as e:
logger.error(f"连接TMDB出错：{e}")
logger.error(f"连接TMDB出错：{str(e)}")
print(traceback.print_exc())
return None
logger.debug(f"API返回：{str(self.search.total_results)}")
@ -508,7 +508,7 @@ class TmdbHelper:
else:
logger.info("%s TMDB网站未查询到媒体信息！" % name)
except Exception as err:
logger.error(f"从TheDbMovie网站查询出错：{err}")
logger.error(f"从TheDbMovie网站查询出错：{str(err)}")
return None
return None

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

@ -33,4 +33,4 @@ class TheTvDbModule(_ModuleBase):
logger.info(f"开始获取TVDB信息: {tvdbid} ...")
return self.tvdb[tvdbid].data
except Exception as err:
logger.error(f"获取TVDB信息失败: {err}")
logger.error(f"获取TVDB信息失败: {str(err)}")

32
app/modules/transmission/transmission.py
View File

@ -45,7 +45,7 @@ class Transmission(metaclass=Singleton):
timeout=60)
return trt
except Exception as err:
logger.error(f"transmission 连接出错：{err}")
logger.error(f"transmission 连接出错：{str(err)}")
return None
def is_inactive(self) -> bool:
@ -73,7 +73,7 @@ class Transmission(metaclass=Singleton):
try:
torrents = self.trc.get_torrents(ids=ids, arguments=self._trarg)
except Exception as err:
logger.error(f"获取种子列表出错：{err}")
logger.error(f"获取种子列表出错：{str(err)}")
return [], True
if status and not isinstance(status, list):
status = [status]
@ -104,7 +104,7 @@ class Transmission(metaclass=Singleton):
torrents, error = self.get_torrents(status=["seeding", "seed_pending"], ids=ids, tags=tags)
return None if error else torrents or []
except Exception as err:
logger.error(f"获取已完成的种子列表出错：{err}")
logger.error(f"获取已完成的种子列表出错：{str(err)}")
return None
def get_downloading_torrents(self, ids: Union[str, list] = None,
@ -121,7 +121,7 @@ class Transmission(metaclass=Singleton):
tags=tags)
return None if error else torrents or []
except Exception as err:
logger.error(f"获取正在下载的种子列表出错：{err}")
logger.error(f"获取正在下载的种子列表出错：{str(err)}")
return None
def set_torrent_tag(self, ids: str, tags: list) -> bool:
@ -136,7 +136,7 @@ class Transmission(metaclass=Singleton):
self.trc.change_torrent(labels=tags, ids=ids)
return True
except Exception as err:
logger.error(f"设置种子标签出错：{err}")
logger.error(f"设置种子标签出错：{str(err)}")
return False
def add_torrent(self, content: Union[str, bytes],
@ -162,7 +162,7 @@ class Transmission(metaclass=Singleton):
labels=labels,
cookies=cookie)
except Exception as err:
logger.error(f"添加种子出错：{err}")
logger.error(f"添加种子出错：{str(err)}")
return None
def start_torrents(self, ids: Union[str, list]) -> bool:
@ -175,7 +175,7 @@ class Transmission(metaclass=Singleton):
self.trc.start_torrent(ids=ids)
return True
except Exception as err:
logger.error(f"启动种子出错：{err}")
logger.error(f"启动种子出错：{str(err)}")
return False
def stop_torrents(self, ids: Union[str, list]) -> bool:
@ -188,7 +188,7 @@ class Transmission(metaclass=Singleton):
self.trc.stop_torrent(ids=ids)
return True
except Exception as err:
logger.error(f"停止种子出错：{err}")
logger.error(f"停止种子出错：{str(err)}")
return False
def delete_torrents(self, delete_file: bool, ids: Union[str, list]) -> bool:
@ -203,7 +203,7 @@ class Transmission(metaclass=Singleton):
self.trc.remove_torrent(delete_data=delete_file, ids=ids)
return True
except Exception as err:
logger.error(f"删除种子出错：{err}")
logger.error(f"删除种子出错：{str(err)}")
return False
def get_files(self, tid: str) -> Optional[List[File]]:
@ -217,7 +217,7 @@ class Transmission(metaclass=Singleton):
try:
torrent = self.trc.get_torrent(tid)
except Exception as err:
logger.error(f"获取种子文件列表出错：{err}")
logger.error(f"获取种子文件列表出错：{str(err)}")
return None
if torrent:
return torrent.files()
@ -234,7 +234,7 @@ class Transmission(metaclass=Singleton):
self.trc.change_torrent(ids=tid, files_wanted=file_ids)
return True
except Exception as err:
logger.error(f"设置下载文件状态出错：{err}")
logger.error(f"设置下载文件状态出错：{str(err)}")
return False
def transfer_info(self) -> Optional[SessionStats]:
@ -246,7 +246,7 @@ class Transmission(metaclass=Singleton):
try:
return self.trc.session_stats()
except Exception as err:
logger.error(f"获取传输信息出错：{err}")
logger.error(f"获取传输信息出错：{str(err)}")
return None
def set_speed_limit(self, download_limit: float = None, upload_limit: float = None) -> bool:
@ -268,7 +268,7 @@ class Transmission(metaclass=Singleton):
)
return True
except Exception as err:
logger.error(f"设置速度限制出错：{err}")
logger.error(f"设置速度限制出错：{str(err)}")
return False
def recheck_torrents(self, ids: Union[str, list]):
@ -280,7 +280,7 @@ class Transmission(metaclass=Singleton):
try:
return self.trc.verify_torrent(ids=ids)
except Exception as err:
logger.error(f"重新校验种子出错：{err}")
logger.error(f"重新校验种子出错：{str(err)}")
return False
def add_trackers(self, ids: Union[str, list], trackers: list):
@ -292,7 +292,7 @@ class Transmission(metaclass=Singleton):
try:
return self.trc.change_torrent(ids=ids, tracker_list=[trackers])
except Exception as err:
logger.error(f"添加Tracker出错：{err}")
logger.error(f"添加Tracker出错：{str(err)}")
return False
def change_torrent(self,
@ -347,5 +347,5 @@ class Transmission(metaclass=Singleton):
seedIdleMode=seedIdleMode,
seedIdleLimit=seedIdleLimit)
except Exception as err:
logger.error(f"设置种子出错：{err}")
logger.error(f"设置种子出错：{str(err)}")
return False

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

@ -117,7 +117,7 @@ class WechatModule(_ModuleBase):
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text=content)
except Exception as err:
logger.error(f"微信消息处理发生错误：{err}")
logger.error(f"微信消息处理发生错误：{str(err)}")
return None
@checkMessage(MessageChannel.Wechat)

4
app/modules/wechat/wechat.py
View File

@ -76,7 +76,7 @@ class WeChat(metaclass=Singleton):
else:
logger.error(f"获取微信access_token失败，未获取到返回信息")
except Exception as e:
logger.error(f"获取微信access_token失败，错误信息：{e}")
logger.error(f"获取微信access_token失败，错误信息：{str(e)}")
return None
return self._access_token
@ -271,7 +271,7 @@ class WeChat(metaclass=Singleton):
logger.error(f"发送请求失败，未获取到返回信息")
return False
except Exception as err:
logger.error(f"发送请求失败，错误信息：{err}")
logger.error(f"发送请求失败，错误信息：{str(err)}")
return False
def create_menus(self, commands: Dict[str, dict]):