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

fix H265|HEVC H254|AVC

Browse Source
This commit is contained in:
jxxghp
2023-08-21 12:32:48 +08:00
parent 75bd4d4b77
commit 0d626ad4b8
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/chain/douban.py
View File

@ -41,7 +41,7 @@ class DoubanChain(ChainBase):
if not mediainfo: if not mediainfo:
logger.warn(f'{meta.name} 未识别到TMDB媒体信息') logger.warn(f'{meta.name} 未识别到TMDB媒体信息')
return Context(meta_info=meta, media_info=MediaInfo(douban_info=doubaninfo)) 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) mediainfo.set_douban_info(doubaninfo)
return Context(meta_info=meta, media_info=mediainfo) return Context(meta_info=meta, media_info=mediainfo)

2
app/chain/rss.py
View File

@ -103,7 +103,7 @@ class RssChain(ChainBase):
logger.error(f'{mediainfo.title_year} 添加自定义订阅失败') logger.error(f'{mediainfo.title_year} 添加自定义订阅失败')
return None, "添加自定义订阅失败" return None, "添加自定义订阅失败"
else: else:
logger.info(f'{mediainfo.title_year}{metainfo.season} 添加订阅成功') logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功')
# 返回结果 # 返回结果
return sid, "" return sid, ""

18
app/chain/subscribe.py
View File

@ -107,13 +107,13 @@ class SubscribeChain(ChainBase):
# 发回原用户 # 发回原用户
self.post_message(Notification(channel=channel, self.post_message(Notification(channel=channel,
mtype=NotificationType.Subscribe, mtype=NotificationType.Subscribe,
title=f"{mediainfo.title_year}{metainfo.season} " title=f"{mediainfo.title_year} {metainfo.season} "
f"添加订阅失败！", f"添加订阅失败！",
text=f"{err_msg}", text=f"{err_msg}",
image=mediainfo.get_message_image(), image=mediainfo.get_message_image(),
userid=userid)) userid=userid))
elif message: elif message:
logger.info(f'{mediainfo.title_year}{metainfo.season} 添加订阅成功') logger.info(f'{mediainfo.title_year} {metainfo.season} 添加订阅成功')
if username or userid: if username or userid:
text = f"评分：{mediainfo.vote_average}，来自用户：{username or userid}" text = f"评分：{mediainfo.vote_average}，来自用户：{username or userid}"
else: else:
@ -121,7 +121,7 @@ class SubscribeChain(ChainBase):
# 广而告之 # 广而告之
self.post_message(Notification(channel=channel, self.post_message(Notification(channel=channel,
mtype=NotificationType.Subscribe, mtype=NotificationType.Subscribe,
title=f"{mediainfo.title_year}{metainfo.season} 已添加订阅", title=f"{mediainfo.title_year} {metainfo.season} 已添加订阅",
text=text, text=text,
image=mediainfo.get_message_image())) image=mediainfo.get_message_image()))
# 返回结果 # 返回结果
@ -213,7 +213,7 @@ class SubscribeChain(ChainBase):
self.subscribeoper.delete(subscribe.id) self.subscribeoper.delete(subscribe.id)
# 发送通知 # 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe, 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())) image=mediainfo.get_message_image()))
continue continue
# 电视剧订阅 # 电视剧订阅
@ -231,7 +231,7 @@ class SubscribeChain(ChainBase):
if no_exists and no_exists.get(subscribe.tmdbid): if no_exists and no_exists.get(subscribe.tmdbid):
no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season) no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season)
if no_exists_info: 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: else:
# 洗版状态 # 洗版状态
if meta.type == MediaType.TV: if meta.type == MediaType.TV:
@ -341,7 +341,7 @@ class SubscribeChain(ChainBase):
self.subscribeoper.delete(subscribe.id) self.subscribeoper.delete(subscribe.id)
# 发送通知 # 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe, 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())) image=mediainfo.get_message_image()))
else: else:
# 当前下载资源的优先级 # 当前下载资源的优先级
@ -351,7 +351,7 @@ class SubscribeChain(ChainBase):
self.subscribeoper.delete(subscribe.id) self.subscribeoper.delete(subscribe.id)
# 发送通知 # 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe, 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())) image=mediainfo.get_message_image()))
else: else:
# 正在洗版，更新资源优先级 # 正在洗版，更新资源优先级
@ -461,7 +461,7 @@ class SubscribeChain(ChainBase):
self.subscribeoper.delete(subscribe.id) self.subscribeoper.delete(subscribe.id)
# 发送通知 # 发送通知
self.post_message(Notification(mtype=NotificationType.Subscribe, 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())) image=mediainfo.get_message_image()))
continue continue
# 电视剧订阅 # 电视剧订阅
@ -479,7 +479,7 @@ class SubscribeChain(ChainBase):
if no_exists and no_exists.get(subscribe.tmdbid): if no_exists and no_exists.get(subscribe.tmdbid):
no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season) no_exists_info = no_exists.get(subscribe.tmdbid).get(subscribe.season)
if no_exists_info: 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: else:
# 洗版 # 洗版
if meta.type == MediaType.TV: if meta.type == MediaType.TV:

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

@ -505,7 +505,7 @@ class FileTransferModule(_ModuleBase):
# 标题 # 标题
"title": mediainfo.title, "title": mediainfo.title,
# 原文件名 # 原文件名
"original_name": meta.org_string, "original_name": f"{meta.org_string}{file_ext}",
# 原语种标题 # 原语种标题
"original_title": mediainfo.original_title, "original_title": mediainfo.original_title,
# 识别名称 # 识别名称

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

@ -15,7 +15,7 @@ class FilterModule(_ModuleBase):
# 内置规则集 # 内置规则集
rule_set: Dict[str, dict] = { rule_set: Dict[str, dict] = {
# 蓝光 # 蓝光原盘
"BLU": { "BLU": {
"include": [r'Blu-?Ray.+VC-?1|Blu-?Ray.+AVC|UHD.+blu-?ray.+HEVC|MiniBD'], "include": [r'Blu-?Ray.+VC-?1|Blu-?Ray.+AVC|UHD.+blu-?ray.+HEVC|MiniBD'],
"exclude": [] "exclude": []
@ -57,12 +57,12 @@ class FilterModule(_ModuleBase):
}, },
# H265 # H265
"H265": { "H265": {
"include": [r'[Hx].?265'], "include": [r'[Hx].?265|HEVC'],
"exclude": [] "exclude": []
}, },
# H264 # H264
"H264": { "H264": {
"include": [r'[Hx].?264'], "include": [r'[Hx].?264|AVC'],
"exclude": [] "exclude": []
}, },
# 杜比 # 杜比