From b307e828a7ef43ec49302bca57f985e1cf8e877b Mon Sep 17 00:00:00 2001
From: EstrellaXD <estrellaxd05@gmail.com>
Date: Thu, 4 May 2023 18:44:12 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20renamer=20=E4=B8=8D=E8=83=BD=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D1000=E9=9B=86=E4=BB=A5=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/module/manager/renamer.py                |  1 +
 src/module/parser/analyser/torrent_parser.py | 12 ++++++------
 src/test/test_torrent_parser.py              |  9 ++++++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py
index 0c8db6c8..04f68936 100644
--- a/src/module/manager/renamer.py
+++ b/src/module/manager/renamer.py
@@ -199,3 +199,4 @@ class Renamer:
                     )
             else:
                 logger.warning(f"{info.name} has no media file")
+
diff --git a/src/module/parser/analyser/torrent_parser.py b/src/module/parser/analyser/torrent_parser.py
index a54dc7e7..0b96b7dd 100644
--- a/src/module/parser/analyser/torrent_parser.py
+++ b/src/module/parser/analyser/torrent_parser.py
@@ -19,7 +19,7 @@ RULES = [
     r"(.*)[\[\ E](\d{1,4}|\d{1,4}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?[\]\ ](.*)",
     r"(.*)\[(?:第)?(\d*\.*\d*)[话集話](?:END)?\](.*)",
     r"(.*)第(\d*\.*\d*)[话話集](?:END)?(.*)",
-    r"(.*)(?<!\w)EP?(\d+)(?!\w)(.*)",
+    r"(.*)(?:S\d{2})?EP?(\d+)(.*)",
 ]
 
 SUBTITLE_LANG = {
@@ -161,8 +161,8 @@ def torrent_parser(
 
 
 if __name__ == '__main__':
-    title = "[MagicStar] 假面骑士Geats / 仮面ライダーギーツ EP33 [WEBDL] [1080p] [TTFC]【生】"
-    folder_name = "名侦探柯南"
-    season = 1
-    suffix = ".mp4"
-    print(torrent_parser(title, folder_name, season, suffix, method="pn"))
\ No newline at end of file
+    title = "海盗战记 S02E17.zh.ass"
+    folder_name = "海盗战记"
+    season = 2
+    suffix = ".ass"
+    print(torrent_parser(title, folder_name, season, suffix, method="advance"))
\ No newline at end of file
diff --git a/src/test/test_torrent_parser.py b/src/test/test_torrent_parser.py
index a9f5a82e..aa710e41 100644
--- a/src/test/test_torrent_parser.py
+++ b/src/test/test_torrent_parser.py
@@ -37,4 +37,11 @@ def test_torrent_parser():
     season = 1
     suffix = ".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"
\ No newline at end of file
+    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") == "海盗战记 S01E01.mp4"
+    assert torrent_parser(file_name, folder_name, season, suffix, "advance") == "海盗战记(2021) S01E01.mp4"
\ No newline at end of file