GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-07 00:16:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2997 from Akimio521/perfect/cn_name

Browse Source
This commit is contained in:
jxxghp
2024-11-03 14:35:49 +08:00
committed by GitHub
parent b6bfd215bc 341526b4d9
commit 15b701803f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core/meta/metaanime.py
-1
View File
@@ -81,7 +81,6 @@ class MetaAnime(MetaBase):
_, self.cn_name, _, _, _, _ = StringUtils.get_keyword(self.cn_name) _, self.cn_name, _, _, _, _ = StringUtils.get_keyword(self.cn_name)
if self.cn_name: if self.cn_name:
self.cn_name = re.sub(r'%s' % self._name_nostring_re, '', self.cn_name, flags=re.IGNORECASE).strip() self.cn_name = re.sub(r'%s' % self._name_nostring_re, '', self.cn_name, flags=re.IGNORECASE).strip()
self.cn_name = zhconv.convert(self.cn_name, "zh-hans")
if self.en_name: if self.en_name:
self.en_name = re.sub(r'%s' % self._name_nostring_re, '', self.en_name, flags=re.IGNORECASE).strip().title() self.en_name = re.sub(r'%s' % self._name_nostring_re, '', self.en_name, flags=re.IGNORECASE).strip().title()
self._name = StringUtils.str_title(self.en_name) self._name = StringUtils.str_title(self.en_name)
app/modules/douban/__init__.py
+2 -1
View File
@@ -2,6 +2,7 @@ import re
from typing import List, Optional, Tuple, Union from typing import List, Optional, Tuple, Union
import cn2an import cn2an
import zhconv
from app import schemas from app import schemas
from app.core.config import settings from app.core.config import settings
@@ -108,7 +109,7 @@ class DoubanModule(_ModuleBase):
elif meta: elif meta:
info = {} info = {}
# 使用中英文名分别识别，去重去空，但要保持顺序 # 使用中英文名分别识别，去重去空，但要保持顺序
names = list(dict.fromkeys([k for k in [meta.cn_name, meta.en_name] if k])) names = list(dict.fromkeys([k for k in [meta.cn_name, zhconv.convert(meta.cn_name, "zh-hans"), meta.en_name] if k]))
for name in names: for name in names:
if meta.begin_season: if meta.begin_season:
logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...") logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...")
app/modules/themoviedb/__init__.py
+2 -1
View File
@@ -1,6 +1,7 @@
from typing import Optional, List, Tuple, Union, Dict from typing import Optional, List, Tuple, Union, Dict
import cn2an import cn2an
import zhconv
from app import schemas from app import schemas
from app.core.config import settings from app.core.config import settings
@@ -117,7 +118,7 @@ class TheMovieDbModule(_ModuleBase):
elif meta: elif meta:
info = {} info = {}
# 使用中英文名分别识别，去重去空，但要保持顺序 # 使用中英文名分别识别，去重去空，但要保持顺序
names = list(dict.fromkeys([k for k in [meta.cn_name, meta.en_name] if k])) names = list(dict.fromkeys([k for k in [meta.cn_name, zhconv.convert(meta.cn_name, "zh-hans"), meta.en_name] if k]))
for name in names: for name in names:
if meta.begin_season: if meta.begin_season:
logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...") logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...")