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/plugins/autobackup/__init__.py
View File

@ -71,7 +71,7 @@ class AutoBackup(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="自动备份")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
if self._onlyonce:
logger.info(f"自动备份服务启动，立即运行一次")

2
app/plugins/autoclean/__init__.py
View File

@ -83,7 +83,7 @@ class AutoClean(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="定时清理媒体库")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
if self._onlyonce:
logger.info(f"定时清理媒体库服务启动，立即运行一次")

4
app/plugins/autosignin/__init__.py
View File

@ -168,9 +168,9 @@ class AutoSignIn(_PluginBase):
logger.info(
f"站点自动签到服务启动，执行周期 {self._start_time}点-{self._end_time}点 每{self._cron}小时执行一次")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
self._cron = ""
self._enabled = False
self.__update_config()

2
app/plugins/autosignin/sites/__init__.py
View File

@ -70,7 +70,7 @@ class _ISiteSigninHandler(metaclass=ABCMeta):
# 解码为字符串
return raw_data.decode(encoding)
except Exception as e:
logger.error(f"chardet解码失败：{e}")
logger.error(f"chardet解码失败：{str(e)}")
return res.text
else:
return res.text

2
app/plugins/autosignin/sites/pterclub.py
View File

@ -48,7 +48,7 @@ class PTerClub(_ISiteSigninHandler):
try:
sign_dict = json.loads(html_text)
except Exception as e:
logger.error(f"{site} 签到失败，签到接口返回数据异常，错误信息：{e}")
logger.error(f"{site} 签到失败，签到接口返回数据异常，错误信息：{str(e)}")
return False, '签到失败，签到接口返回数据异常'
if sign_dict['status'] == '1':
# {"status":"1","data":" (签到已成功300)","message":"<p>这是您的第<b>237</b>次签到，

4
app/plugins/autosignin/sites/tjupt.py
View File

@ -141,7 +141,7 @@ class Tjupt(_ISiteSigninHandler):
proxy=proxy,
site=site)
except (FileNotFoundError, IOError, OSError) as e:
logger.debug(f"查询本地已知答案失败：{e}，继续请求豆瓣查询")
logger.debug(f"查询本地已知答案失败：{str(e)}，继续请求豆瓣查询")
# 本地不存在正确答案则请求豆瓣查询匹配
for value, answer in answers:
@ -236,7 +236,7 @@ class Tjupt(_ISiteSigninHandler):
with open(self._answer_file, 'w') as f:
f.write(formatted_data)
except (FileNotFoundError, IOError, OSError) as e:
logger.debug(f"签到成功写入本地文件失败：{e}")
logger.debug(f"签到成功写入本地文件失败：{str(e)}")
@staticmethod
def _tohash(img, shape=(10, 10)):

4
app/plugins/bestfilmversion/__init__.py
View File

@ -84,9 +84,9 @@ class BestFilmVersion(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="收藏洗版")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
else:
self._scheduler.add_job(self.sync, "interval", minutes=30, name="收藏洗版")

4
app/plugins/brushflow/__init__.py
View File

@ -236,8 +236,8 @@ class BrushFlow(_PluginBase):
try:
self._scheduler.add_job(self.brush, 'interval', minutes=self._cron)
except Exception as e:
logger.error(f"站点刷流服务启动失败：{e}")
self.systemmessage.put(f"站点刷流服务启动失败：{e}")
logger.error(f"站点刷流服务启动失败：{str(e)}")
self.systemmessage.put(f"站点刷流服务启动失败：{str(e)}")
return
if self._onlyonce:
logger.info(f"站点刷流服务启动，立即运行一次")

6
app/plugins/doubansync/__init__.py
View File

@ -92,9 +92,9 @@ class DoubanSync(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="豆瓣想看")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
else:
self._scheduler.add_job(self.sync, "interval", minutes=30, name="豆瓣想看")
@ -541,7 +541,7 @@ class DoubanSync(_PluginBase):
"time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
})
except Exception as err:
logger.error(f'同步用户 {user_id} 豆瓣想看数据出错：{err}')
logger.error(f'同步用户 {user_id} 豆瓣想看数据出错：{str(err)}')
logger.info(f"用户 {user_id} 豆瓣想看同步完成")
# 保存历史记录
self.save_data('history', history)

2
app/plugins/downloadingmsg/__init__.py
View File

@ -68,7 +68,7 @@ class DownloadingMsg(_PluginBase):
seconds=int(self._seconds),
name="下载进度推送")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 启动任务
if self._scheduler.get_jobs():

2
app/plugins/invitessignin/__init__.py
View File

@ -69,7 +69,7 @@ class InvitesSignin(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="药丸签到")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
if self._onlyonce:
logger.info(f"药丸签到服务启动，立即运行一次")

4
app/plugins/libraryscraper/__init__.py
View File

@ -79,8 +79,8 @@ class LibraryScraper(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="媒体库刮削")
except Exception as e:
logger.error(f"媒体库刮削服务启动失败，原因：{e}")
self.systemmessage.put(f"媒体库刮削服务启动失败，原因：{e}")
logger.error(f"媒体库刮削服务启动失败，原因：{str(e)}")
self.systemmessage.put(f"媒体库刮削服务启动失败，原因：{str(e)}")
else:
logger.info(f"媒体库刮削服务启动，周期：每7天")
self._scheduler.add_job(func=self.__libraryscraper,

6
app/plugins/mediasyncdel/__init__.py
View File

@ -90,9 +90,9 @@ class MediaSyncDel(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="媒体库同步删除")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
else:
self._scheduler.add_job(self.sync_del_by_log, "interval", minutes=30, name="媒体库同步删除")
@ -996,7 +996,7 @@ class MediaSyncDel(_PluginBase):
return delete_flag, True, handle_cnt
except Exception as e:
logger.error(f"删种失败： {e}")
logger.error(f"删种失败： {str(e)}")
return False, False, 0
def __del_seed(self, download, download_id, action_flag, handle_cnt):

4
app/plugins/messageforward/__init__.py
View File

@ -351,7 +351,7 @@ class MessageForward(_PluginBase):
logger.error(f"转发消息 {title} 失败，未获取到返回信息")
return False
except Exception as err:
logger.error(f"转发消息 {title} 异常，错误信息：{err}")
logger.error(f"转发消息 {title} 异常，错误信息：{str(err)}")
return False
def __get_access_token(self, corpid: str, appsecret: str):
@ -377,7 +377,7 @@ class MessageForward(_PluginBase):
logger.error(f"{corpid} {appsecret} 获取token失败")
return None, None, None
except Exception as e:
logger.error(f"获取微信access_token失败，错误信息：{e}")
logger.error(f"获取微信access_token失败，错误信息：{str(e)}")
return None, None, None
def stop_service(self):

2
app/plugins/moviepilotupdatenotify/__init__.py
View File

@ -63,7 +63,7 @@ class MoviePilotUpdateNotify(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="检查MoviePilot更新")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 启动任务
if self._scheduler.get_jobs():

2
app/plugins/nastoolsync/__init__.py
View File

@ -73,7 +73,7 @@ class NAStoolSync(_PluginBase):
"site": self._site,
}
)
logger.error(f"无法打开数据库文件 {self._nt_db_path}，请检查路径是否正确：{e}")
logger.error(f"无法打开数据库文件 {self._nt_db_path}，请检查路径是否正确：{str(e)}")
return
# 创建游标cursor来执行executeＳＱＬ语句

22
app/plugins/personmeta/__init__.py
View File

@ -610,7 +610,7 @@ class PersonMeta(_PluginBase):
else:
logger.debug(f"人物 {people.get('Name')} 未找到中文数据")
except Exception as err:
logger.error(f"更新人物信息失败：{err}")
logger.error(f"更新人物信息失败：{str(err)}")
return None
def __get_douban_actors(self, mediainfo: MediaInfo, season: int = None) -> List[dict]:
@ -652,7 +652,7 @@ class PersonMeta(_PluginBase):
if res:
return res.json()
except Exception as err:
logger.error(f"获取Emby媒体项详情失败：{err}")
logger.error(f"获取Emby媒体项详情失败：{str(err)}")
return {}
def __get_jellyfin_iteminfo() -> dict:
@ -668,7 +668,7 @@ class PersonMeta(_PluginBase):
result['FileName'] = Path(result['Path']).name
return result
except Exception as err:
logger.error(f"获取Jellyfin媒体项详情失败：{err}")
logger.error(f"获取Jellyfin媒体项详情失败：{str(err)}")
return {}
def __get_plex_iteminfo() -> dict:
@ -702,7 +702,7 @@ class PersonMeta(_PluginBase):
iteminfo['CommunityRating'] = plexitem.audienceRating
return iteminfo
except Exception as err:
logger.error(f"获取Plex媒体项详情失败：{err}")
logger.error(f"获取Plex媒体项详情失败：{str(err)}")
return {}
if server == "emby":
@ -732,7 +732,7 @@ class PersonMeta(_PluginBase):
if res:
return res.json()
except Exception as err:
logger.error(f"获取Emby媒体的所有子媒体项失败：{err}")
logger.error(f"获取Emby媒体的所有子媒体项失败：{str(err)}")
return {}
def __get_jellyfin_items() -> dict:
@ -748,7 +748,7 @@ class PersonMeta(_PluginBase):
if res:
return res.json()
except Exception as err:
logger.error(f"获取Jellyfin媒体的所有子媒体项失败：{err}")
logger.error(f"获取Jellyfin媒体的所有子媒体项失败：{str(err)}")
return {}
def __get_plex_items() -> dict:
@ -814,7 +814,7 @@ class PersonMeta(_PluginBase):
items['Items'].append(item)
return items
except Exception as err:
logger.error(f"获取Plex媒体的所有子媒体项失败：{err}")
logger.error(f"获取Plex媒体的所有子媒体项失败：{str(err)}")
return {}
if server == "emby":
@ -848,7 +848,7 @@ class PersonMeta(_PluginBase):
logger.error(f"更新Emby媒体项详情失败，错误码：{res.status_code}")
return False
except Exception as err:
logger.error(f"更新Emby媒体项详情失败：{err}")
logger.error(f"更新Emby媒体项详情失败：{str(err)}")
return False
def __set_jellyfin_iteminfo():
@ -869,7 +869,7 @@ class PersonMeta(_PluginBase):
logger.error(f"更新Jellyfin媒体项详情失败，错误码：{res.status_code}")
return False
except Exception as err:
logger.error(f"更新Jellyfin媒体项详情失败：{err}")
logger.error(f"更新Jellyfin媒体项详情失败：{str(err)}")
return False
def __set_plex_iteminfo():
@ -887,7 +887,7 @@ class PersonMeta(_PluginBase):
plexitem.editTitle(iteminfo['Name']).editSummary(iteminfo['Overview']).reload()
return True
except Exception as err:
logger.error(f"更新Plex媒体项详情失败：{err}")
logger.error(f"更新Plex媒体项详情失败：{str(err)}")
return False
if server == "emby":
@ -920,7 +920,7 @@ class PersonMeta(_PluginBase):
else:
logger.warn(f"{imageurl} 图片下载失败，请检查网络连通性")
except Exception as err:
logger.error(f"下载图片失败：{err}")
logger.error(f"下载图片失败：{str(err)}")
return None
def __set_emby_item_image(_base64: str):

6
app/plugins/rsssubscribe/__init__.py
View File

@ -100,9 +100,9 @@ class RssSubscribe(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="RSS订阅")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
else:
self._scheduler.add_job(self.check, "interval", minutes=30, name="RSS订阅")
@ -658,7 +658,7 @@ class RssSubscribe(_PluginBase):
"time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
})
except Exception as err:
logger.error(f'刷新RSS数据出错：{err}')
logger.error(f'刷新RSS数据出错：{str(err)}')
logger.info(f"RSS {url} 刷新完成")
# 保存历史记录
self.save_data('history', history)

6
app/plugins/sitestatistic/__init__.py
View File

@ -128,9 +128,9 @@ class SiteStatistic(_PluginBase):
trigger=CronTrigger.from_crontab(self._cron),
name="站点数据统计")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 推送实时消息
self.systemmessage.put(f"执行周期配置错误：{err}")
self.systemmessage.put(f"执行周期配置错误：{str(err)}")
else:
triggers = TimerUtils.random_scheduler(num_executions=1,
begin_hour=0,
@ -836,7 +836,7 @@ class SiteStatistic(_PluginBase):
if site_schema.match(html_text):
return site_schema
except Exception as e:
logger.error(f"站点匹配失败 {e}")
logger.error(f"站点匹配失败 {str(e)}")
return None
def build(self, site_info: CommentedMap) -> Optional[ISiteUserInfo]:

2
app/plugins/sitestatistic/siteuserinfo/nexus_php.py
View File

@ -123,7 +123,7 @@ class NexusPhpSiteUserInfo(ISiteUserInfo):
if bonus_match and bonus_match.group(1).strip():
self.bonus = StringUtils.str_float(bonus_match.group(1).strip('"'))
except Exception as err:
logger.error(f"{self.site_name} 解析魔力值出错, 错误信息: {err}")
logger.error(f"{self.site_name} 解析魔力值出错, 错误信息: {str(err)}")
@staticmethod
def _parse_ucoin(html):

2
app/plugins/sitestatistic/siteuserinfo/nexus_rabbit.py
View File

@ -38,7 +38,7 @@ class NexusRabbitSiteUserInfo(NexusPhpSiteUserInfo):
try:
torrents = json.loads(html_text).get('data')
except Exception as e:
logger.error(f"解析做种信息失败: {e}")
logger.error(f"解析做种信息失败: {str(e)}")
return
page_seeding_size = 0

2
app/plugins/syncdownloadfiles/__init__.py
View File

@ -101,7 +101,7 @@ class SyncDownloadFiles(_PluginBase):
name="自动同步下载器文件记录")
logger.info(f"自动同步下载器文件记录服务启动，时间间隔 {self._time} 小时")
except Exception as err:
logger.error(f"定时任务配置错误：{err}")
logger.error(f"定时任务配置错误：{str(err)}")
# 启动任务
if self._scheduler.get_jobs():

8
app/plugins/torrenttransfer/__init__.py
View File

@ -109,8 +109,8 @@ class TorrentTransfer(_PluginBase):
self._scheduler.add_job(self.transfer,
CronTrigger.from_crontab(self._cron))
except Exception as e:
logger.error(f"转移做种服务启动失败：{e}")
self.systemmessage.put(f"转移做种服务启动失败：{e}")
logger.error(f"转移做种服务启动失败：{str(e)}")
self.systemmessage.put(f"转移做种服务启动失败：{str(e)}")
return
if self._onlyonce:
logger.info(f"转移做种服务启动，立即运行一次")
@ -594,7 +594,7 @@ class TorrentTransfer(_PluginBase):
torrent_main = bdecode(content)
main_announce = torrent_main.get('announce')
except Exception as err:
logger.warn(f"解析种子文件 {torrent_file} 失败：{err}")
logger.warn(f"解析种子文件 {torrent_file} 失败：{str(err)}")
fail += 1
continue
@ -623,7 +623,7 @@ class TorrentTransfer(_PluginBase):
# 编码并保存到临时文件
torrent_file.write_bytes(bencode(torrent_main))
except Exception as err:
logger.error(f"解析fastresume文件 {fastresume_file} 出错：{err}")
logger.error(f"解析fastresume文件 {fastresume_file} 出错：{str(err)}")
fail += 1
continue