From 41bc1a9d4df105c63a24b4f3e256f90e02447499 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Wed, 12 Jul 2023 21:49:35 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=90=9C=E7=B4=A2=E5=8C=B9=E9=85=8DBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/chain/search.py | 9 ++++++--- app/utils/string.py | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/chain/search.py b/app/chain/search.py index aef5dcfb..45bd953e 100644 --- a/app/chain/search.py +++ b/app/chain/search.py @@ -166,14 +166,17 @@ class SearchChain(ChainBase): logger.warn(f'{torrent.site_name} - {torrent.title} 年份不匹配') continue # 比对标题 - if torrent_meta.name in [mediainfo.title, mediainfo.original_title]: + meta_name = StringUtils.clear_upper(torrent_meta.name) + if meta_name in [ + StringUtils.clear_upper(mediainfo.title), + StringUtils.clear_upper(mediainfo.original_title) + ]: logger.info(f'{mediainfo.title} 匹配到资源:{torrent.site_name} - {torrent.title}') _match_torrents.append(torrent) continue # 比对别名和译名 for name in mediainfo.names: - if StringUtils.clear(name).strip().upper() == \ - StringUtils.clear(torrent_meta.name).strip().upper(): + if StringUtils.clear_upper(name) == meta_name: logger.info(f'{mediainfo.title} 匹配到资源:{torrent.site_name} - {torrent.title}') _match_torrents.append(torrent) break diff --git a/app/utils/string.py b/app/utils/string.py index 11a1b809..f49f587a 100644 --- a/app/utils/string.py +++ b/app/utils/string.py @@ -169,6 +169,15 @@ class StringUtils: else: return [StringUtils.clear(x) for x in text] + @staticmethod + def clear_upper(text: str) -> str: + """ + 去除特殊字符,同时大写 + """ + if not text: + return "" + return StringUtils.clear(text).upper().strip() + @staticmethod def str_filesize(size: Union[str, float, int], pre: int = 2) -> str: """