From da7d3addf87b9a1bbf3e6568482dd12325e7b1de Mon Sep 17 00:00:00 2001
From: EstrellaXD <estrellaxd05@gmail.com>
Date: Thu, 4 Aug 2022 21:24:31 +0800
Subject: [PATCH] =?UTF-8?q?2.5.23=20-=20=E5=A6=82=E6=9E=9C=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=94=99=E8=AF=AF=EF=BC=8C=E4=BC=9A=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20-=20=E8=B0=83=E6=95=B4=20eps=5Fco?=
 =?UTF-8?q?llect=20=E8=BF=90=E8=A1=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app.py          |  2 +-
 src/core/renamer.py | 35 ++++++++++++++++-------------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/app.py b/src/app.py
index f8fee060..fa99a533 100644
--- a/src/app.py
+++ b/src/app.py
@@ -70,7 +70,7 @@ def main_process(bangumi_data, download_client: DownloadClient):
         times = 0
         if settings.enable_rss_collector:
             rss_analyser.run(bangumi_data["bangumi_info"], download_client)
-        if settings.eps_complete:
+        if settings.eps_complete and bangumi_data["bangumi_info"] != []:
             FullSeasonGet().eps_complete(bangumi_data["bangumi_info"], download_client)
         logger.info("Running....")
         save_data_file(bangumi_data)
diff --git a/src/core/renamer.py b/src/core/renamer.py
index e00f1783..9606254e 100644
--- a/src/core/renamer.py
+++ b/src/core/renamer.py
@@ -59,19 +59,22 @@ class Renamer:
             name = info.name
             torrent_hash = info.hash
             path_name, season, folder_name, suffix, _ = self.split_path(info.content_path)
-            try:
-                new_name = self._renamer.download_parser(name, folder_name, season, suffix, settings.method)
-                if path_name != new_name:
-                    self.client.rename_torrent_file(torrent_hash, path_name, new_name)
-                    rename_count += 1
-                else:
-                    continue
-            except Exception as e:
-                logger.warning(f"{path_name} rename failed")
-                logger.warning(f"Folder name: {folder_name}, Season: {season}, Suffix: {suffix}")
-                logger.debug(e)
-                if settings.remove_bad_torrent:
-                    self.client.delete_torrent(torrent_hash)
+            if path_name is folder_name:
+                logger.warning("Wrong bangumi path, please check your qbittorrent settings.")
+            else:
+                try:
+                    new_name = self._renamer.download_parser(name, folder_name, season, suffix, settings.method)
+                    if path_name != new_name:
+                        self.client.rename_torrent_file(torrent_hash, path_name, new_name)
+                        rename_count += 1
+                    else:
+                        continue
+                except Exception as e:
+                    logger.warning(f"{path_name} rename failed")
+                    logger.warning(f"Folder name: {folder_name}, Season: {season}, Suffix: {suffix}")
+                    logger.debug(e)
+                    if settings.remove_bad_torrent:
+                        self.client.delete_torrent(torrent_hash)
         self.print_result(torrent_count, rename_count)
 
     def set_folder(self):
@@ -83,9 +86,3 @@ class Renamer:
             # print(new_path)
             self.client.move_torrent(torrent_hash, new_path)
 
-
-if __name__ == "__main__":
-    from conf.const_dev import DEV_SETTINGS
-    settings.init(DEV_SETTINGS)
-    rename = Renamer(DownloadClient())
-    rename.run()
\ No newline at end of file