mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-09-05 07:27:15 +08:00
perfect(MetaAnime): self.cn_name 属性不再进行简化处理,在使用 TMDB 和豆瓣查询时再查询简体化名字
This commit is contained in:
@@ -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)
|
||||||
|
|||||||
@@ -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}季 ...")
|
||||||
|
|||||||
@@ -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}季 ...")
|
||||||
|
|||||||
Reference in New Issue
Block a user