Merge pull request #4500 from Miralia/v2

refactor(meta): 将 web_source 处理逻辑统一到 MetaBase 并添加到消息模板

app/core/meta/metabase.py

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

app/core/meta/metavideo.py

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

app/helper/message.py

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