diff --git a/app/core/meta/metaanime.py b/app/core/meta/metaanime.py index 0e8b426a..691602d0 100644 --- a/app/core/meta/metaanime.py +++ b/app/core/meta/metaanime.py @@ -81,7 +81,6 @@ class MetaAnime(MetaBase): _, self.cn_name, _, _, _, _ = StringUtils.get_keyword(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 = zhconv.convert(self.cn_name, "zh-hans") if self.en_name: 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) diff --git a/app/modules/douban/__init__.py b/app/modules/douban/__init__.py index 94774463..5f37bd78 100644 --- a/app/modules/douban/__init__.py +++ b/app/modules/douban/__init__.py @@ -2,6 +2,7 @@ import re from typing import List, Optional, Tuple, Union import cn2an +import zhconv from app import schemas from app.core.config import settings @@ -108,7 +109,7 @@ class DoubanModule(_ModuleBase): elif meta: 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: if meta.begin_season: logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...") diff --git a/app/modules/themoviedb/__init__.py b/app/modules/themoviedb/__init__.py index 8e29c021..3e7f9ed8 100644 --- a/app/modules/themoviedb/__init__.py +++ b/app/modules/themoviedb/__init__.py @@ -1,6 +1,7 @@ from typing import Optional, List, Tuple, Union, Dict import cn2an +import zhconv from app import schemas from app.core.config import settings @@ -117,7 +118,7 @@ class TheMovieDbModule(_ModuleBase): elif meta: 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: if meta.begin_season: logger.info(f"正在识别 {name} 第{meta.begin_season}季 ...")