From 80a390ac6c255ddcd3193f66c43e9991db63588c Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 7 Apr 2024 14:25:12 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=A7=8D=E5=AD=90=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E6=8B=BC=E9=9F=B3=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?= =?UTF-8?q?=EF=BC=8C=E4=BB=8E=E5=89=AF=E6=A0=87=E9=A2=98=E4=B8=AD=E6=8F=90?= =?UTF-8?q?=E5=8F=96=E4=B8=AD=E6=96=87=E5=90=8D=E7=94=A8=E4=BA=8E=E8=AF=86?= =?UTF-8?q?=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/meta/metabase.py | 4 +-- app/core/meta/metavideo.py | 73 +++++++++++++++++++++++++++++++++++++- requirements.txt | 3 +- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/app/core/meta/metabase.py b/app/core/meta/metabase.py index c2b49a7c..9276034b 100644 --- a/app/core/meta/metabase.py +++ b/app/core/meta/metabase.py @@ -75,8 +75,8 @@ class MetaBase(object): def __init__(self, title: str, subtitle: str = None, isfile: bool = False): if not title: return - self.org_string = title - self.subtitle = subtitle + self.org_string = title.strip() if title else None + self.subtitle = subtitle.strip() if subtitle else None self.isfile = isfile @property diff --git a/app/core/meta/metavideo.py b/app/core/meta/metavideo.py index af36b7f3..c7df7b90 100644 --- a/app/core/meta/metavideo.py +++ b/app/core/meta/metavideo.py @@ -1,13 +1,16 @@ import re from pathlib import Path +from typing import Optional + +from Pinyin2Hanzi import is_pinyin from app.core.config import settings from app.core.meta.customization import CustomizationMatcher from app.core.meta.metabase import MetaBase from app.core.meta.releasegroup import ReleaseGroupsMatcher +from app.schemas.types import MediaType from app.utils.string import StringUtils from app.utils.tokens import Tokens -from app.schemas.types import MediaType class MetaVideo(MetaBase): @@ -52,6 +55,12 @@ class MetaVideo(MetaBase): _audio_encode_re = r"^DTS\d?$|^DTSHD$|^DTSHDMA$|^Atmos$|^TrueHD\d?$|^AC3$|^\dAudios?$|^DDP\d?$|^DD\d?$|^LPCM\d?$|^AAC\d?$|^FLAC\d?$|^HD\d?$|^MA\d?$" def __init__(self, title: str, subtitle: str = None, isfile: bool = False): + """ + 初始化 + :param title: 标题 + :param subtitle: 副标题 + :param isfile: 是否是文件名 + """ super().__init__(title, subtitle, isfile) if not title: return @@ -130,12 +139,47 @@ class MetaVideo(MetaBase): # 处理part if self.part and self.part.upper() == "PART": self.part = None + # 没有中文标题时，偿试中描述中获取中文名 + if not self.cn_name and self.en_name and self.subtitle: + if self.__is_pinyin(self.en_name): + # 英文名是拼音 + cn_name = self.__get_title_from_description(self.subtitle) + if len(cn_name) == len(self.en_name.split()): + # 中文名和拼音单词数相同，认为是中文名 + self.cn_name = cn_name # 制作组/字幕组 self.resource_team = ReleaseGroupsMatcher().match(title=original_title) or None # 自定义占位符 self.customization = CustomizationMatcher().match(title=original_title) or None + @staticmethod + def __get_title_from_description(description: str) -> Optional[str]: + """ + 从描述中提取标题 + """ + if not description: + return None + titles = re.split(r'[\s/|]+', description) + if StringUtils.is_chinese(titles[0]): + return titles[0] + return None + + @staticmethod + def __is_pinyin(name_str: str) -> bool: + """ + 判断是否拼音 + """ + if not name_str: + return False + for n in name_str.lower().split(): + if not is_pinyin(n): + return False + return True + def __fix_name(self, name: str): + """ + 去掉名字中不需要的干扰字符 + """ if not name: return name name = re.sub(r'%s' % self._name_nostring_re, '', name, @@ -157,6 +201,9 @@ class MetaVideo(MetaBase): return name def __init_name(self, token: str): + """ + 识别名称 + """ if not token: return # 回收标题 @@ -250,6 +297,9 @@ class MetaVideo(MetaBase): self._last_token_type = "enname" def __init_part(self, token: str): + """ + 识别Part + """ if not self.name: return if not self.year \ @@ -273,6 +323,9 @@ class MetaVideo(MetaBase): # self._stop_name_flag = False def __init_year(self, token: str): + """ + 识别年份 + """ if not self.name: return if not token.isdigit(): @@ -295,6 +348,9 @@ class MetaVideo(MetaBase): self._stop_name_flag = True def __init_resource_pix(self, token: str): + """ + 识别分辨率 + """ if not self.name: return re_res = re.findall(r"%s" % self._resources_pix_re, token, re.IGNORECASE) @@ -331,6 +387,9 @@ class MetaVideo(MetaBase): self.resource_pix = re_res.group(1).lower() def __init_season(self, token: str): + """ + 识别季 + """ re_res = re.findall(r"%s" % self._season_re, token, re.IGNORECASE) if re_res: self._last_token_type = "season" @@ -380,6 +439,9 @@ class MetaVideo(MetaBase): self.begin_season = 1 def __init_episode(self, token: str): + """ + 识别集 + """ re_res = re.findall(r"%s" % self._episode_re, token, re.IGNORECASE) if re_res: self._last_token_type = "episode" @@ -450,6 +512,9 @@ class MetaVideo(MetaBase): self._last_token_type = "EPISODE" def __init_resource_type(self, token): + """ + 识别资源类型 + """ if not self.name: return source_res = re.search(r"(%s)" % self._source_re, token, re.IGNORECASE) @@ -488,6 +553,9 @@ class MetaVideo(MetaBase): self._last_token = effect.upper() def __init_video_encode(self, token: str): + """ + 识别视频编码 + """ if not self.name: return if not self.year \ @@ -528,6 +596,9 @@ class MetaVideo(MetaBase): self.video_encode = f"{self.video_encode} 10bit" def __init_audio_encode(self, token: str): + """ + 识别音频编码 + """ if not self.name: return if not self.year \ diff --git a/requirements.txt b/requirements.txt index 0a026413..c9fdb01e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,4 +55,5 @@ docker~=6.1.3 cachetools~=5.3.1 fast-bencode~=1.1.3 pystray~=0.19.5 -pyotp~=2.9.0 \ No newline at end of file +pyotp~=2.9.0 +Pinyin2Hanzi~=0.1.1 \ No newline at end of file