fix: fix some title parse error

fix title parse error

Author: shinonomeow

backend/src/module/downloader/client/openlist/openlist.py

@@ -38,21 +38,23 @@
 
 class Downloader(BaseDownloader):
     def __init__(self):
+        super().__init__()
+        self._client: httpx.AsyncClient | None = None
         self.config: DownloaderConfig = get_plugin_config(
             DownloaderConfig(), "downloader"
         )
-        self.host: str = self.config.host
-        self.username: str = self.config.username
-        self.password: str = self.config.password
-        self.headers = {
-            "Authorization": f"{self.password}",
+        self.api_interval: float = 1.0
+
+    @override
+    def initialize(self) -> None:
+        """初始化下载器"""
+        # 加载配置
+        self.config = get_plugin_config(DownloaderConfig(), "downloader")
+        self.headers: dict[str, str] = {
+            "Authorization": f"{self.config.password}",
         }
-        self.api_interval: int = 1
-        self.ssl: bool = settings.downloader.ssl
-        self._client: httpx.AsyncClient = httpx.AsyncClient(
-            base_url=self.host,
-            # trust_env=self.ssl,
-            headers=self.headers,
+        self._client = httpx.AsyncClient(
+            base_url=self.config.host, verify=settings.downloader.ssl
         )
 
     @override
@@ -72,11 +74,11 @@ async def check_host(self) -> bool:
             )
             resp.raise_for_status()
             if resp.status_code == 200:
-                logger.debug(f"[openlist] Successfully connected to {self.host}")
+                logger.debug(f"[openlist] Successfully connected to {self.config.host}")
                 return True
         except (httpx.ConnectError, httpx.TimeoutException, httpx.ReadTimeout) as e:
             logger.error(
-                f"[openlist] Check host error, please check your host {self.host}"
+                f"[openlist] Check host error, please check your host {self.config.host}"
             )
             logger.debug(f"[openlist] Check host error: {e}")
 
@@ -136,22 +138,6 @@ async def torrents_info(
         limit: int = 0,
     ):
         return []
-        try:
-            data = {"page": 1, "per_page": limit if limit > 0 else 100}
-            resp = await self._client.get(
-                url=ALIST_API_URL["offline_list_done"],
-            )
-            resp.raise_for_status()
-            result = resp.json()
-            if result.get("code") == 200:
-                tasks = result.get("data", [])
-                filtered_tasks = []
-                for task in tasks:
-                    print(task)
-            return []
-        except Exception as e:
-            self.handle_exception(e, "torrents_info")
-            return []
 
     @override
     async def add(self, torrent_url: str, save_path, category) -> str | bool:

backend/src/module/downloader/client/qbittorrent/qbittorrent.py

@@ -42,8 +42,6 @@ def __init__(self):  # , host: str, username: str, password: str, ssl: bool
             DownloaderConfig(), "downloader"
         )
         self.api_interval: float = 0.2
-        self.ssl: bool = False
-        self.host: str = ""
 
     @override
     def initialize(self) -> None:

backend/src/module/models/bangumi.py

@@ -1,5 +1,3 @@
-from dataclasses import dataclass
-
 from pydantic import BaseModel
 from sqlmodel import Field, SQLModel
 
@@ -30,8 +28,6 @@ class BangumiBase(SQLModel):
         default=None, alias="bangumi_id", title="番剧Bangumi ID"
     )
     mikan_id: str | None = Field(default=None, alias="mikan_id", title="番剧Mikan ID")
-    # filter: str = Field(default="", alias="filter", title="番剧过滤器")
-    # 感觉是不是与 rss 表用外键关联更好
     rss_link: str = Field(default="", alias="rss_link", title="番剧RSS链接")
     poster_link: str = Field(default="", alias="poster_link", title="番剧海报链接")
     rule_name: str | None = Field(default=None, alias="rule_name", title="番剧规则名")
@@ -61,14 +57,15 @@ class Episode(BaseModel):
     title_en: str = Field(default="", alias="title_en", title="英文标题")
     title_zh: str = Field(default="", alias="title_zh", title="中文标题")
     title_jp: str = Field(default="", alias="title_jp", title="日文标题")
+    title_romaji: str = Field(default="", alias="title_romaji", title="罗马音标题")
     season: int = Field(default=1, ge=0, alias="season", title="番剧季度")
     season_raw: str = Field(default="", alias="season_raw", title="番剧季度原名")
     episode: int = Field(default=0, ge=0, alias="episode", title="番剧集数")
     sub: str = Field(default="", alias="sub", title="字幕语言")
     sub_type: str = Field(default="", alias="sub_type", title="字幕类型")
     group: str = Field(default="", alias="group", title="字幕组")
     resolution: str = Field(default="", alias="resolution", title="分辨率")
-    source: str = Field(default="", alias="source", title="来源")
+    source: str = Field(default="", alias="source", title="视频来源")
     audio_info: list[str] = Field(
         default_factory=list, alias="audio_info", title="音频信息"
     )

backend/src/module/parser/analyser/meta_parser.py

@@ -4,7 +4,7 @@
 
 from module.models import Episode
 
-from . import patterns as p
+from module.parser.analyser import patterns as p
 
 logger = logging.getLogger(__name__)
 
@@ -38,25 +38,27 @@ class TitleMetaParser:
     """
 
     def __init__(self) -> None:
-        self.raw_title = ""
-        self.title = ""
-        self.token = []
+        self.raw_title: str = ""
+        self.title: str = ""
+        self.token: list[str] = []
 
     def process_title(self) -> None:
         """预处理标题，统一格式"""
+        # title 里面可能有"\n"
         self.title = self.title.replace("\n", " ")
-
         # 如果以【开头
+        #
         if self.title.startswith("【"):
             translation_table = str.maketrans("【】", "[]")
             self.title = self.title.translate(translation_table)
         self.title = self.title.strip()
-        self.title += "_"
+        self.title += "/"
 
     def parser(self, title: str) -> Episode:
         self.raw_title = title
         self.title = title
         self.process_title()
+        group = self.get_group_info()
         source_info = self.get_source_info()
         resolution_info = self.get_resolution_info()
         audio_info = self.get_audio_info()
@@ -76,6 +78,8 @@ def parser(self, title: str) -> Episode:
         temp_title = self.title
         if "/[]" in temp_title:
             parts = temp_title.split("/[]")
+            # /[] 代表可信的集数或季度, 所以可以相信后面是与集数无用的信息
+            # 暂时没有哪个组把集数放前面
             if len(parts) > 1:
                 temp_title = "[]".join(parts[:-1])
         self.token = re.split(r"[\[\]]", temp_title)
@@ -85,7 +89,8 @@ def parser(self, title: str) -> Episode:
             name_jp,
         ) = self.name_process()
 
-        group = self.get_group()
+        if not group:
+            group = self.get_group()
         source = source_info[0] if source_info else ""
         sub = sub_language
         resolution = resolution_info[0] if resolution_info else ""
@@ -106,7 +111,7 @@ def parser(self, title: str) -> Episode:
             video_info=video_info,
         )
 
-    def findall_sub_title(self, pattern: re.Pattern, sym: str = "[]") -> Any:
+    def findall_sub_title(self, pattern: re.Pattern[str], sym: str = "[]") -> list[str]:
         """查找并替换标题中的模式"""
         ans = re.findall(pattern, self.title)
         if ans:
@@ -115,6 +120,13 @@ def findall_sub_title(self, pattern: re.Pattern, sym: str = "[]") -> Any:
             ans = re.findall(pattern, self.raw_title)
         return ans
 
+    def get_group_info(self) -> str:
+        """获取字幕组信息"""
+        group_info = self.findall_sub_title(p.GROUP_RE)
+        # 用& 合并多个字幕组信息
+        group_info = "&".join(group_info).strip()
+        return group_info
+
     def get_episode_info(self) -> tuple[Any, bool, Any, bool]:
         """获取剧集和季度信息"""
         episode_info = self.findall_sub_title(p.EPISODE_PATTERN, sym="/[]")
@@ -140,7 +152,6 @@ def parser_episode(self, episode_info: Any, episode_is_trusted: bool) -> int:
             un_trusted_episode_list.append(
                 self.episode_info_to_episode(un_trusted_episode)
             )
-
         # 所有的集数一致
         if all(x == un_trusted_episode_list[0] for x in un_trusted_episode_list):
             return un_trusted_episode_list[0]
@@ -208,7 +219,9 @@ def name_process(self) -> tuple[str, str, str]:
 
         # 简化 token 过滤逻辑
         max_len = min(10, len(self.token))
-        self.token = [token for token in self.token[:max_len] if len(token.strip()) > 1]
+        self.token = [
+            token.strip() for token in self.token[:max_len] if len(token.strip()) > 1
+        ]
 
         self.token = self.token[:5]
         token_priority = [len(s) for s in self.token]
@@ -278,19 +291,19 @@ def get_group(self) -> str:
                 return group
         return ""
 
-    def get_video_info(self) -> Any:
+    def get_video_info(self) -> list[str]:
         """获取视频格式信息"""
         return self.findall_sub_title(p.VIDEO_TYPE_PATTERN)
 
-    def get_resolution_info(self) -> Any:
+    def get_resolution_info(self) -> list[str]:
         """获取分辨率信息"""
         return self.findall_sub_title(p.RESOLUTION_RE)
 
-    def get_source_info(self) -> Any:
+    def get_source_info(self) -> list[str]:
         """获取视频来源信息"""
         return self.findall_sub_title(p.SOURCE_RE)
 
-    def get_unuseful_info(self) -> Any:
+    def get_unuseful_info(self) -> list[str]:
         """获取无用信息"""
         return self.findall_sub_title(p.UNUSEFUL_RE)
 
@@ -365,23 +378,23 @@ def is_point_5(title: str) -> bool:
     # title = "前辈是男孩子 (2024) S01E02.mp4"
     # title = "[SBSUB][CONAN][1082][V2][1080P][AVC_AAC][CHS_JP](C1E4E331).mp4"
     # title = "海盗战记 S01E01.zh-tw.ass"
-    title = "[百冬练习组&LoliHouse] BanG Dream! 少女乐团派对！☆PICO FEVER！ / Garupa Pico: Fever! - 26 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][END] [101.69 MB]"
+    # title = "[百冬练习组&LoliHouse] BanG Dream! 少女乐团派对！☆PICO FEVER！ / Garupa Pico: Fever! - 26 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][END] [101.69 MB]"
     # title ="【喵萌奶茶屋】★04月新番★[夏日重现/Summer Time Rendering][11][1080p][繁日双语][招募翻译]"
     # title = "【失眠搬运组】放学后失眠的你-Kimi wa Houkago Insomnia - 06 [bilibili - 1080p AVC1 CHS-JP].mp4"
     # title = "[KitaujiSub] Shikanoko Nokonoko Koshitantan [01Pre][WebRip][HEVC_AAC][CHS_JP].mp4"
     # title = "[Doomdos] - 白色闪电 - 第02话 - [1080P].mp4"
-    # title = "Doomdos] -凡人修仙传-第107话-[1080P].mp"
+    # title = "[Doomdos] -凡人修仙传-第107话-[1080P].mp"
     # title = "[豌豆字幕组&风之圣殿字幕组】★04月新番[鬼灭之刃 柱训练篇 / Kimetsu_no_Yaiba-Hashira_Geiko_Hen][02(57)][简体][1080P][MP4]"
     # title = "迷宮飯 08/[TOC] Delicious in Dungeon [08][1080P][AVC AAC][CHT][MP4].mp4"
     # title = "[喵萌奶茶屋&LoliHouse] 葬送的芙莉莲 / Sousou no Frieren - 06 [WebRip 1080p HEVC-10bit AAC][简繁日内封字幕]"
     # title = "[LoliHouse] Ore wa Subete wo Parry suru - 05 [WebRip 1080p HEVC-10bit AAC SRTx2]"
-    # title = " [LoliHouse] 我要【招架】一切 ～反误解的世界最强想成为冒险者～ / Ore wa Subete wo Parry suru - 05 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕] [复制磁连]"
+    title = " [LoliHouse] 我要【招架】一切 ～反误解的世界最强想成为冒险者～ / Ore wa Subete wo Parry suru - 05 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕] [复制磁连]"
     # title = "北宇治字幕组] 夜晚的水母不会游泳 / Yoru no Kurage wa Oyogenai [01-12 修正合集][WebRip][HEVC_AAC][简繁日内封] [复制磁连]"
     # title = "[北宇治字组&霜庭云花Sub&氢气烤肉架]【我推的孩子】/【Oshi no Ko】[18][WebRip][HEVC_AAC][繁日内嵌]"
     # # print(re.findall(RESOLUTION_RE,title))
-    title = (
-        "[织梦字幕组][尼尔：机械纪元 NieR Automata Ver1.1a][02集][1080P][AVC][简日双语]"
-    )
+    # title = (
+    #     "[织梦字幕组][尼尔：机械纪元 NieR Automata Ver1.1a][02集][1080P][AVC][简日双语]"
+    # )
     # title = "[ANi] Bakemonogatari / 物语系列 第外季＆第怪季 - 06.5 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4][ANi] Bakemonogatari / 物语系列 第外季＆第怪季 - 06.5 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4][217.2 MB]"
     # title = "ANi] 我獨自升級 - 07.5 [1080P][Baha][WEB-DL][AAC AVC][CHT].mp4"
     # title = "[NEO·QSW]古莲泰沙U グレンダイザーU Grendizer U 02[WEBRIP AVC 1080P]（搜索用：巨灵神/克雷飞天神）"
@@ -391,28 +404,29 @@ def is_point_5(title: str) -> bool:
     # )
     # title = "物语系列 S05E06.5.mp4 "
     # title = " 【幻月字幕组】【24年日剧】【直到破坏了丈夫的家庭】【第7话】【1080P】【中日双语】.mp4"
-    title = "[LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][609.59 MB]"
+    # title = "[LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕][609.59 MB]"
     # title = "[ANi] Re：从零开始的异世界生活 第三季 - 01 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4] [复制磁连]"
     # title = "[AnimeRep] 蓝箱 / 青之箱 / Blue Box / Ao no Hako- 02 [1080p][简中内嵌]"
     # title = "[ANi] Kekkon Surutte Hontou desu ka /  听说你们要结婚！？ - 03 [1080P][baha][WEB-DL][AAC AVC][CHT][MP4]"
-    # title = "[DBD-Raws][败犬女主太多了！/Make Heroine ga Oosugiru!/负けヒロインが多すぎる!][07-08TV+特典映像][BOX4][1080P][BDRip][HEVC-10bit][FLACx2][MKV] [复制磁连]"
+    title = "[DBD-Raws][败犬女主太多了！/Make Heroine ga Oosugiru!/负けヒロインが多すぎる!][07-08TV+特典映像][BOX4][1080P][BDRip][HEVC-10bit][FLACx2][MKV] [复制磁连]"
     # title = "[漫猫字幕组&猫恋汉化组] 败犬女主太多了/Make Heroine ga Oosugiru (01-12Fin WEBRIP 1080p AVC AAC MP4 2024年7月 简中) [复制磁连]"
-    title = "[北宇治字幕组&LoliHouse] 地。-关于地球的运动- / Chi. Chikyuu no Undou ni Tsuite 03 [WebRip 1080p HEVC-10bit AAC ASSx2][简繁日内封字幕] [复制磁连]"
+    # title = "[北宇治字幕组&LoliHouse] 地。-关于地球的运动- / Chi. Chikyuu no Undou ni Tsuite 03 [WebRip 1080p HEVC-10bit AAC ASSx2][简繁日内封字幕] [复制磁连]"
     # title = "[Lilith-Raws] Boku no Kokoro no Yabai Yatsu - 01 [Baha][WEB-DL][1080p][AVC AAC][CHT][MP4].mp4"
     # title = "[LoliHouse] 关于我转生变成史莱姆这档事 第三季 / Tensei Shitara Slime Datta Ken 3rd Season - 17.5(65.5) [WebRip 1080p HEVC-10bit AAC][简繁内封字幕] [复制磁连]"
     # title = "水星的魔女(2022) S00E19.mp4"
     # title = "[Billion Meta Lab] 终末列车寻往何方 Shuumatsu Torein Dokoe Iku [12][1080][HEVC 10bit][简繁日内封][END]"
-    # title = " 幻樱字幕组】【4月新番】【古见同学有交流障碍症 第二季 Komi-san wa, Komyushou Desu. S02】【22】【GB_MP4】【1920X1080】"
+    # title = "【幻樱字幕组】【4月新番】【古见同学有交流障碍症 第二季 Komi-san wa, Komyushou Desu. S02】【22】【GB_MP4】【1920X1080】"
     # title = "【1月】超超超超超喜欢你的100个女朋友 第二季 07.mp4"
     # print(is_vd(title))
     # print(is_point_5(title))
     # title = "[云歌字幕组][Re:从零开始的异世界生活 第三季 袭击篇][01][HEVC][x265 10bit][1080p][简日双语][招募校对] [复制磁连]"
-    # title = "NEO·QSW]想星的阿克艾利昂 情感神话 想星のアクエリオン Aquarion: Myth of Emotions 02[WEBRIP AVC 1080P]（搜索用：想星的大天使）"
+    # title = "[NEO·QSW]想星的阿克艾利昂 情感神话 想星のアクエリオン Aquarion: Myth of Emotions 02[WEBRIP AVC 1080P]（搜索用：想星的大天使）"
     # title = "[SBSUBJ[CONAN][1155][WEBRIP][1080P1[AVC_AAC][CHT_JP](8D4F664C).mp4"
     # title = "[TOC] 最弱技能《果实大师》 ～关于能无限食用技能果实（吃了就会死）这件事～ 09 [1080P][AVC AAC][CHT][MP4] [复制磁连]"
     # title = "[ANi] 离开 A 级队伍的我，和从前的弟子往迷宫深处迈进 - 08 [1080P][Baha][WEB-DL][AAC AVC][CHT][MP4] [复制磁连]"
     # title = "【喵萌奶茶屋】★04月新番★[夏日重现/Summer Time Rendering][11][1080p][繁日双语][招募翻译]"
     # title = "海盗战记 (2019) S01E01.mp4"
+    # title = "somethime error"
     # print(title)
     # print(re.findall(EPISODE_PATTERN, title))
     # print(re.findall(SEASON_RE, title))
@@ -433,9 +447,13 @@ def is_point_5(title: str) -> bool:
     # title = (
     #     "[梦蓝字幕组]New Doraemon 哆啦A梦新番[747][2023.02.25][AVC][1080P][GB_JP][MP4]"
     # )
-    title = "负けヒロインが多すぎる！ (JPBD Vol.1-6 Remux) 败犬女主太多了！ 败北女角太多了！ Make Heroine ga Oosugiru! Toooooo Many Losing Heroines! [复制磁连]"
-    title = "海盗战记 S01E01.SC.ass"
-    title = "[LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕].mkv"
+    # title = "负けヒロインが多すぎる！ (JPBD Vol.1-6 Remux) 败犬女主太多了！ 败北女角太多了！ Make Heroine ga Oosugiru! Toooooo Many Losing Heroines! [复制磁连]"
+    # title = "海盗战记 S01E01.SC.ass"
+    # title = "[LoliHouse] 2.5次元的诱惑 / 2.5-jigen no Ririsa - 01 [WebRip 1080p HEVC-10bit AAC][简繁内封字幕].mkv"
+    # title = "[桜都字幕组&7³ACG] 摇曳露营 第3季/ゆるキャン△ SEASON3/Yuru Camp S03 | 01-12+New Anime 01-03 [简繁字幕] BDrip 1080p AV1 OPUS 2.0 [复制磁连]"
+    #
+    #
+    # print(re.findall(p.GROUP_RE, title))
     res = raw_parser(title)
     for k, v in res.__dict__.items():
         print(f"{k}: {v}")