From 33b7cb6da7b423ad2cc264d68575b8246275719f Mon Sep 17 00:00:00 2001
From: EstrellaXD <estrellaxd05@gmail.com>
Date: Wed, 29 Jun 2022 00:02:34 +0800
Subject: [PATCH] 2.5.4 fix rename module

---
 auto_bangumi/parser/analyser/raw_parser.py    | 4 ++--
 auto_bangumi/parser/analyser/rename_parser.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/auto_bangumi/parser/analyser/raw_parser.py b/auto_bangumi/parser/analyser/raw_parser.py
index 49377f66..f653f387 100644
--- a/auto_bangumi/parser/analyser/raw_parser.py
+++ b/auto_bangumi/parser/analyser/raw_parser.py
@@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
 
 EPISODE_RE = re.compile(r"\d{1,3}")
 TITLE_RE = re.compile(
-    r"\[(.*)[] ]-?[ \[第](\d{1,4})(?:[vV]\d)?(?:[ \]话話集])?(?:END)?(.*)"
+    r"(.*|\[.*])( -? \d{1,3} |\[\d{1,3}]|\[\d{1,3}.?[vV]\d{1}]|[第]\d{1,3}[话話集]|\[\d{1,3}.?END])(.*)"
 )
 RESOLUTION_RE = re.compile(r"1080|720|2160|4K")
 SOURCE_RE = re.compile(r"B-Global|[Bb]aha|[Bb]ilibili|AT-X|Web")
@@ -165,5 +165,5 @@ class RawParser:
 
 if __name__ == "__main__":
     test = RawParser()
-    ep = test.analyse("[Nekomoe kissaten][Komi-san wa, Komyushou Desu.] - 1002 [WebRip 1080p HEVC-10bit AAC ASSx2]")
+    ep = test.analyse("[Nekomoe kissaten][Summer Time Rendering - 11 [1080p][JPTC].mp4")
     print(ep.title, ep.dpi)
diff --git a/auto_bangumi/parser/analyser/rename_parser.py b/auto_bangumi/parser/analyser/rename_parser.py
index b23ada82..869f043f 100644
--- a/auto_bangumi/parser/analyser/rename_parser.py
+++ b/auto_bangumi/parser/analyser/rename_parser.py
@@ -10,7 +10,8 @@ logger = logging.getLogger(__name__)
 class DownloadParser:
     def __init__(self):
         self.rules = [
-            r"(.*)(?: -)?[\[ E](\d{1,3}|\d{1,3}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?[\] ](.*)",
+            r"(.*) - (\d{1,4}|\d{1,4}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?(.*)",
+            r"(.*)[\[ E](\d{1,3}|\d{1,3}\.\d{1,2})(?:v\d{1,2})?(?: )?(?:END)?[\] ](.*)",
             r"(.*)\[第(\d*\.*\d*)话(?:END)?\](.*)",
             r"(.*)\[第(\d*\.*\d*)話(?:END)?\](.*)",
             r"(.*)第(\d*\.*\d*)话(?:END)?(.*)",
@@ -84,7 +85,7 @@ class DownloadParser:
 
 
 if __name__ == "__main__":
-    name = "[Nekomoe kissaten][Summer Time Rendering][11][1080p][JPTC].mp4"
+    name = "[Nekomoe kissaten][Summer Time Rendering - 11 [1080p][JPTC].mp4"
     rename = DownloadParser()
     new_name = rename.rename_pn(name, 1)
     print(new_name)
\ No newline at end of file