From ca8047caaac2603bce845eaaeac6b5b1805980a3 Mon Sep 17 00:00:00 2001 From: EstrellaXD Date: Fri, 5 May 2023 10:58:17 +0800 Subject: [PATCH] Change notification form --- src/module/manager/renamer.py | 4 ++-- src/module/parser/analyser/torrent_parser.py | 8 +++---- src/test/test_torrent_parser.py | 25 ++++++++++---------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py index 417fb106..c5dedc12 100644 --- a/src/module/manager/renamer.py +++ b/src/module/manager/renamer.py @@ -47,7 +47,7 @@ class Renamer: torrent_name = info.name suffix = os.path.splitext(media_path)[-1] compare_name = self.get_file_name(media_path) - new_path, episode = self._renamer.torrent_parser( + new_path = self._renamer.torrent_parser( torrent_name=torrent_name, bangumi_name=bangumi_name, season=season, @@ -57,7 +57,7 @@ class Renamer: if compare_name != new_path: try: self._client.rename_torrent_file(_hash=info.hash, old_path=media_path, new_path=new_path) - self._notification.send_msg(bangumi_name, f"第{episode}集已经更新，已自动重命名。") + self._notification.send_msg(bangumi_name, f"{new_path}已经更新，已自动重命名。") except Exception as e: logger.warning(f"{torrent_name} rename failed") logger.warning(f"Season name: {bangumi_name}, Season: {season}, Suffix: {suffix}") diff --git a/src/module/parser/analyser/torrent_parser.py b/src/module/parser/analyser/torrent_parser.py index 85334d7a..e6a05165 100644 --- a/src/module/parser/analyser/torrent_parser.py +++ b/src/module/parser/analyser/torrent_parser.py @@ -47,7 +47,7 @@ def rename_normal(info: DownloadInfo): episode = match_obj.group(2) title = re.sub(r"([Ss]|Season )\d{1,3}", "", match_obj.group(1)).strip() new_name = f"{title} S{info.season}E{episode}{match_obj.group(3)}" - return new_name, episode + return new_name def rename_pn(info: DownloadInfo): @@ -62,7 +62,7 @@ def rename_pn(info: DownloadInfo): "", f"{title} S{info.season}E{episode}{info.suffix}", ) - return new_name, episode + return new_name def rename_advance(info: DownloadInfo): @@ -75,7 +75,7 @@ def rename_advance(info: DownloadInfo): "", f"{info.folder_name} S{info.season}E{episode}{info.suffix}", ) - return new_name, episode + return new_name def rename_no_season_pn(info: DownloadInfo): @@ -89,7 +89,7 @@ def rename_no_season_pn(info: DownloadInfo): "", f"{title} E{episode}{info.suffix}", ) - return new_name, episode + return new_name def rename_none(info: DownloadInfo): diff --git a/src/test/test_torrent_parser.py b/src/test/test_torrent_parser.py index 46d6e281..a61c96dd 100644 --- a/src/test/test_torrent_parser.py +++ b/src/test/test_torrent_parser.py @@ -6,42 +6,41 @@ def test_torrent_parser(): folder_name = "我内心的糟糕念头(2023)" season = 1 suffix = ".mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "Boku no Kokoro no Yabai Yatsu S01E01.mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "我内心的糟糕念头(2023) S01E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "Boku no Kokoro no Yabai Yatsu S01E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "我内心的糟糕念头(2023) S01E01.mp4" assert torrent_parser(file_name, folder_name, season, suffix, "none") == "[Lilith-Raws] Boku no Kokoro no Yabai Yatsu - 01 [Baha][WEB-DL][1080p][AVC AAC][CHT][MP4].mp4" - file_name = "[Sakurato] Tonikaku Kawaii S2 [01][AVC-8bit 1080p AAC][CHS].mp4" folder_name = "总之就是非常可爱(2021)" season = 2 suffix = ".mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "Tonikaku Kawaii S02E01.mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "总之就是非常可爱(2021) S02E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "Tonikaku Kawaii S02E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "总之就是非常可爱(2021) S02E01.mp4" file_name = "[SweetSub&LoliHouse] Heavenly Delusion - 01 [WebRip 1080p HEVC-10bit AAC ASSx2].mkv" folder_name = "天国大魔境(2023)" season = 1 suffix = ".mkv" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "Heavenly Delusion S01E01.mkv" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "天国大魔境(2023) S01E01.mkv" + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "Heavenly Delusion S01E01.mkv" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "天国大魔境(2023) S01E01.mkv" file_name = "[SBSUB][Kanojo mo Kanojo][01][GB][1080P](456E234).mp4" folder_name = "女友也要有" season = 1 suffix = ".mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "Kanojo mo Kanojo S01E01.mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "女友也要有 S01E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "Kanojo mo Kanojo S01E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "女友也要有 S01E01.mp4" file_name = "[SBSUB][CONAN][1082][V2][1080P][AVC_AAC][CHS_JP](C1E4E331).mp4" folder_name = "名侦探柯南(1996)" season = 1 suffix = ".mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "CONAN S01E1082.mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "名侦探柯南(1996) S01E1082.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "CONAN S01E1082.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "名侦探柯南(1996) S01E1082.mp4" file_name = "海盗战记 S01E01.mp4" folder_name = "海盗战记(2021)" season = 1 suffix = ".mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "pn")[0] == "海盗战记 S01E01.mp4" - assert torrent_parser(file_name, folder_name, season, suffix, "advance")[0] == "海盗战记(2021) S01E01.mp4" \ No newline at end of file + assert torrent_parser(file_name, folder_name, season, suffix, "pn") == "海盗战记 S01E01.mp4" + assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "海盗战记(2021) S01E01.mp4"