From 84e794ad2153d8adbfbe8106eda17f38c2459612 Mon Sep 17 00:00:00 2001
From: EstrellaXD <estrellaxd05@gmail.com>
Date: Tue, 28 Jun 2022 18:37:05 +0800
Subject: [PATCH] 2.5.3 fix rename module

---
 auto_bangumi/parser/analyser/raw_parser.py    | 8 ++++----
 auto_bangumi/parser/analyser/rename_parser.py | 4 ++--
 docs/部署说明.md                              | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/auto_bangumi/parser/analyser/raw_parser.py b/auto_bangumi/parser/analyser/raw_parser.py
index cf70d090..49377f66 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,3} |\[\d{1,3}]|\[\d{1,3}.?[vV]\d{1}]|[第]\d{1,3}[话話集]|\[\d{1,3}.?END])(.*)"
+    r"\[(.*)[] ]-?[ \[第](\d{1,4})(?:[vV]\d)?(?:[ \]话話集])?(?:END)?(.*)"
 )
 RESOLUTION_RE = re.compile(r"1080|720|2160|4K")
 SOURCE_RE = re.compile(r"B-Global|[Bb]aha|[Bb]ilibili|AT-X|Web")
@@ -140,7 +140,7 @@ class RawParser:
 
         return name, season, season_raw, episode, sub, dpi, source, name_group, group
 
-    def analyse(self, raw) -> Episode:
+    def analyse(self, raw):
         try:
             ret = self.process(raw)
             if ret is None:
@@ -165,5 +165,5 @@ class RawParser:
 
 if __name__ == "__main__":
     test = RawParser()
-    ep = test.analyse("[Nekomoe kissaten] Komi-san wa, Komyushou Desu. 02 [WebRip 1080p HEVC-10bit AAC ASSx2]")
-    print(ep.title)
+    ep = test.analyse("[Nekomoe kissaten][Komi-san wa, Komyushou Desu.] - 1002 [WebRip 1080p HEVC-10bit AAC ASSx2]")
+    print(ep.title, ep.dpi)
diff --git a/auto_bangumi/parser/analyser/rename_parser.py b/auto_bangumi/parser/analyser/rename_parser.py
index 8142b14b..b23ada82 100644
--- a/auto_bangumi/parser/analyser/rename_parser.py
+++ b/auto_bangumi/parser/analyser/rename_parser.py
@@ -10,7 +10,7 @@ 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"(.*)(?: -)?[\[ 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 +84,7 @@ class DownloadParser:
 
 
 if __name__ == "__main__":
-    name = "[Nekomoe kissaten] Komi-san wa, Komyushou Desu. S02 - 02 [WebRip 1080p HEVC-10bit AAC ASSx2].mkv"
+    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
diff --git a/docs/部署说明.md b/docs/部署说明.md
index f15990ec..517477ae 100644
--- a/docs/部署说明.md
+++ b/docs/部署说明.md
@@ -181,7 +181,7 @@ docker run -d \
 | `AB_DOWNLOAD_PATH`       | qBittorrent 中的下载路径                    | `/downloads/Bangumi` |
 | `AB_RSS`                 | RSS 订阅地址                              | 必填项                  |
 | `AB_ENABLE_TMDB`         | 启动 TMDB 解析                            | `False`              |
-| `AB_LANGUAGE`                         | 选择语言                                  | `zh`                 |
+| `AB_LANGUAGE`      | 选择语言                                  | `zh`                 |
 | `AB_NOT_CONTAIN`         | 输入想要过滤的元素                             | `720`                |
 | `AB_DEBUG_MODE`          | 调试模式                                  | `False`              |
 | `AB_EP_COMPLETE`         | 历史番剧下载                                | `False`              |