nas/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-05-16 13:55:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4500 from Miralia/v2

Browse Source 
refactor(meta): 将 web_source 处理逻辑统一到 MetaBase 并添加到消息模板
This commit is contained in:
jxxghp
2025-06-29 11:11:35 +08:00
committed by GitHub
parent 07b4c8b462 53c8c50779
commit ec227d0d56
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/core/meta/metabase.py
View File

@@ -55,6 +55,8 @@ class MetaBase(object):
resource_team: Optional[str] = None resource_team: Optional[str] = None
# 识别的自定义占位符 # 识别的自定义占位符
customization: Optional[str] = None customization: Optional[str] = None
# 识别的流媒体平台
web_source: Optional[str] = None
# 视频编码 # 视频编码
video_encode: Optional[str] = None video_encode: Optional[str] = None
# 音频编码 # 音频编码
@@ -402,6 +404,8 @@ class MetaBase(object):
返回资源类型字符串，含分辨率 返回资源类型字符串，含分辨率
""" """
ret_string = "" ret_string = ""
if self.web_source:
ret_string = f"{ret_string} {self.web_source}"
if self.resource_type: if self.resource_type:
ret_string = f"{ret_string} {self.resource_type}" ret_string = f"{ret_string} {self.resource_type}"
if self.resource_effect: if self.resource_effect:
@@ -416,6 +420,8 @@ class MetaBase(object):
返回资源类型字符串，不含分辨率 返回资源类型字符串，不含分辨率
""" """
ret_string = "" ret_string = ""
if self.web_source:
ret_string = f"{ret_string} {self.web_source}"
if self.resource_type: if self.resource_type:
ret_string = f"{ret_string} {self.resource_type}" ret_string = f"{ret_string} {self.resource_type}"
if self.resource_effect: if self.resource_effect:

4
app/core/meta/metavideo.py
View File

@@ -67,7 +67,6 @@ class MetaVideo(MetaBase):
original_title = title original_title = title
self._source = "" self._source = ""
self._effect = [] self._effect = []
self.web_source = None
self._index = 0 self._index = 0
# 判断是否纯数字命名 # 判断是否纯数字命名
if isfile \ if isfile \
@@ -140,9 +139,6 @@ class MetaVideo(MetaBase):
self.resource_effect = " ".join(self._effect) self.resource_effect = " ".join(self._effect)
if self._source: if self._source:
self.resource_type = self._source.strip() self.resource_type = self._source.strip()
# 添加流媒体平台
if self.web_source:
self.resource_type = f"{self.web_source} {self.resource_type}"
# 提取原盘DIY # 提取原盘DIY
if self.resource_type and "BluRay" in self.resource_type: if self.resource_type and "BluRay" in self.resource_type:
if (self.subtitle and re.findall(r'D[Ii]Y', self.subtitle)) \ if (self.subtitle and re.findall(r'D[Ii]Y', self.subtitle)) \

2
app/helper/message.py
View File

@@ -183,6 +183,8 @@ class TemplateContextBuilder:
"videoCodec": meta.video_encode, "videoCodec": meta.video_encode,
# 音频编码 # 音频编码
"audioCodec": meta.audio_encode, "audioCodec": meta.audio_encode,
# 流媒体平台
"webSource": meta.web_source,
} }
self._context.update({**meta_info, **tech_metadata, **episode_data}) self._context.update({**meta_info, **tech_metadata, **episode_data})