diff --git a/app/chain/douban.py b/app/chain/douban.py index cd1c6557..3b597b05 100644 --- a/app/chain/douban.py +++ b/app/chain/douban.py @@ -41,7 +41,7 @@ class DoubanChain(ChainBase): if not mediainfo: logger.warn(f'{meta.name} 未识别到TMDB媒体信息') return Context(meta_info=meta, media_info=MediaInfo(douban_info=doubaninfo)) - logger.info(f'识别到媒体信息:{mediainfo.type.value} {mediainfo.title_year}{meta.season}') + logger.info(f'识别到媒体信息:{mediainfo.type.value} {mediainfo.title_year} {meta.season}') mediainfo.set_douban_info(doubaninfo) return Context(meta_info=meta, media_info=mediainfo) diff --git a/app/chain/rss.py b/app/chain/rss.py index 45ab96d9..3b1e5bde 100644 --- a/app/chain/rss.py +++ b/app/chain/rss.py @@ -103,7 +103,7 @@ class RssChain(ChainBase): logger.error(f'{mediainfo.title_year} 添加自定义订阅失败') return None, "添加自定义订阅失败" else: - logger.info(f'{mediainfo.title_year}{metainfo.season} 添加订阅成功') + logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功') # 返回结果 return sid, "" diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 6d2edb39..51349e5d 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -107,13 +107,13 @@ class SubscribeChain(ChainBase): # 发回原用户 self.post_message(Notification(channel=channel, mtype=NotificationType.Subscribe, - title=f"{mediainfo.title_year}{metainfo.season} " + title=f"{mediainfo.title_year} {metainfo.season} " f"添加订阅失败!", text=f"{err_msg}", image=mediainfo.get_message_image(), userid=userid)) elif message: - logger.info(f'{mediainfo.title_year}{metainfo.season} 添加订阅成功') + logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功') if username or userid: text = f"评分:{mediainfo.vote_average},来自用户:{username or userid}" else: @@ -121,7 +121,7 @@ class SubscribeChain(ChainBase): # 广而告之 self.post_message(Notification(channel=channel, mtype=NotificationType.Subscribe, - title=f"{mediainfo.title_year}{metainfo.season} 已添加订阅", + title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅", text=text, image=mediainfo.get_message_image())) # 返回结果 @@ -213,7 +213,7 @@ class SubscribeChain(ChainBase): self.subscribeoper.delete(subscribe.id) # 发送通知 self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'{mediainfo.title_year}{meta.season} 已完成订阅', + title=f'{mediainfo.title_year} {meta.season} 已完成订阅', image=mediainfo.get_message_image())) continue # 电视剧订阅 @@ -231,7 +231,7 @@ class SubscribeChain(ChainBase): if no_exists and no_exists.get(subscribe.tmdbid): no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season) if no_exists_info: - logger.info(f'订阅 {mediainfo.title_year}{meta.season} 缺失集:{no_exists_info.episodes}') + logger.info(f'订阅 {mediainfo.title_year} {meta.season} 缺失集:{no_exists_info.episodes}') else: # 洗版状态 if meta.type == MediaType.TV: @@ -341,7 +341,7 @@ class SubscribeChain(ChainBase): self.subscribeoper.delete(subscribe.id) # 发送通知 self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'{mediainfo.title_year}{meta.season} 已完成订阅', + title=f'{mediainfo.title_year} {meta.season} 已完成订阅', image=mediainfo.get_message_image())) else: # 当前下载资源的优先级 @@ -351,7 +351,7 @@ class SubscribeChain(ChainBase): self.subscribeoper.delete(subscribe.id) # 发送通知 self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'{mediainfo.title_year}{meta.season} 已洗版完成', + title=f'{mediainfo.title_year} {meta.season} 已洗版完成', image=mediainfo.get_message_image())) else: # 正在洗版,更新资源优先级 @@ -461,7 +461,7 @@ class SubscribeChain(ChainBase): self.subscribeoper.delete(subscribe.id) # 发送通知 self.post_message(Notification(mtype=NotificationType.Subscribe, - title=f'{mediainfo.title_year}{meta.season} 已完成订阅', + title=f'{mediainfo.title_year} {meta.season} 已完成订阅', image=mediainfo.get_message_image())) continue # 电视剧订阅 @@ -479,7 +479,7 @@ class SubscribeChain(ChainBase): if no_exists and no_exists.get(subscribe.tmdbid): no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season) if no_exists_info: - logger.info(f'订阅 {mediainfo.title_year}{meta.season} 缺失集:{no_exists_info.episodes}') + logger.info(f'订阅 {mediainfo.title_year} {meta.season} 缺失集:{no_exists_info.episodes}') else: # 洗版 if meta.type == MediaType.TV: diff --git a/app/modules/filetransfer/__init__.py b/app/modules/filetransfer/__init__.py index e77e35e2..e416d4c0 100644 --- a/app/modules/filetransfer/__init__.py +++ b/app/modules/filetransfer/__init__.py @@ -505,7 +505,7 @@ class FileTransferModule(_ModuleBase): # 标题 "title": mediainfo.title, # 原文件名 - "original_name": meta.org_string, + "original_name": f"{meta.org_string}{file_ext}", # 原语种标题 "original_title": mediainfo.original_title, # 识别名称 diff --git a/app/modules/filter/__init__.py b/app/modules/filter/__init__.py index 89776154..06745438 100644 --- a/app/modules/filter/__init__.py +++ b/app/modules/filter/__init__.py @@ -15,7 +15,7 @@ class FilterModule(_ModuleBase): # 内置规则集 rule_set: Dict[str, dict] = { - # 蓝光 + # 蓝光原盘 "BLU": { "include": [r'Blu-?Ray.+VC-?1|Blu-?Ray.+AVC|UHD.+blu-?ray.+HEVC|MiniBD'], "exclude": [] @@ -57,12 +57,12 @@ class FilterModule(_ModuleBase): }, # H265 "H265": { - "include": [r'[Hx].?265'], + "include": [r'[Hx].?265|HEVC'], "exclude": [] }, # H264 "H264": { - "include": [r'[Hx].?264'], + "include": [r'[Hx].?264|AVC'], "exclude": [] }, # 杜比