From 007f00b8ba3a897ccdbee055dffe92efc4eab467 Mon Sep 17 00:00:00 2001
From: Radiquum <kentai.waah@gmail.com>
Date: Tue, 12 Jul 2022 18:46:23 +0500
Subject: [PATCH] minor fixes

---
 Modules/download.py  | 44 +++++++++++++++++++++++++-------------------
 Modules/functions.py | 19 +++++++++++++------
 Modules/index.py     | 12 +++++++-----
 3 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/Modules/download.py b/Modules/download.py
index 7ad3b35..e2251d1 100644
--- a/Modules/download.py
+++ b/Modules/download.py
@@ -20,8 +20,9 @@ if config.cookies is not None:  # add cookies if present
 
 
 def download(path):
-
-    response = requests_retry_session(session=session).get(f"{config.BASE_URL}{path}")
+    response = requests_retry_session(session=session).get(
+        f"{config.BASE_URL}{path}"
+    )
     s = BeautifulSoup(response.text, "html.parser")
 
     # System messages
@@ -38,8 +39,12 @@ def download(path):
 
     filename = sanitize_filename(image.split("/")[-1:][0])
 
-    author = s.find(class_="submission-id-sub-container").find("a").find("strong").text
-    title = sanitize_filename(s.find(class_="submission-title").find("p").contents[0])
+    author = (
+        s.find(class_="submission-id-sub-container").find("a").find("strong").text
+    )
+    title = sanitize_filename(
+        s.find(class_="submission-title").find("p").contents[0]
+    )
     view_id = int(path.split("/")[-2:-1][0])
 
     output = f"{config.output_folder}/{author}"
@@ -61,25 +66,22 @@ def download(path):
     if config.dont_redownload is True and (
         os.path.isfile(output_path_fb) or os.path.isfile(output_path)
     ):
+        return file_exists_fallback(author, title, view_id)
+
+    image_url = f"https:{image}"
+
+    if download_file(image_url, output_path, f"{title} - [{rating}]") is True:
         with open(
             f"{config.output_folder}/index.idx", encoding="utf-8", mode="a+"
         ) as idx:
             idx.write(f"({view_id})\n")
-        return file_exists_fallback(author, title)
-
-    image_url = f"https:{image}"
-    download_file(
-        image_url,
-        output_path,
-        f"{title} - \
-[{rating}]",
-    )
-
-    with open(f"{config.output_folder}/index.idx", encoding="utf-8", mode="a+") as idx:
-        idx.write(f"({view_id})\n")
 
     if config.metadata is True:
-        dsc = s.find(class_="submission-description").text.strip().replace("\r\n", "\n")
+        dsc = (
+            s.find(class_="submission-description")
+            .text.strip()
+            .replace("\r\n", "\n")
+        )
         if config.json_description is True:
             dsc = []
         data = {
@@ -96,7 +98,9 @@ def download(path):
             "species": s.find(class_="info").findAll("div")[2].find("span").text,
             "gender": s.find(class_="info").findAll("div")[3].find("span").text,
             "views": int(s.find(class_="views").find(class_="font-large").text),
-            "favorites": int(s.find(class_="favorites").find(class_="font-large").text),
+            "favorites": int(
+                s.find(class_="favorites").find(class_="font-large").text
+            ),
             "rating": rating,
             "comments": [],
         }
@@ -182,7 +186,9 @@ def create_metadata(output, data, s, title, filename):
         json.dump(data, f, ensure_ascii=False, indent=4)
 
 
-def file_exists_fallback(author, title):
+def file_exists_fallback(author, title, view_id):
+    with open(f"{config.output_folder}/index.idx", encoding="utf-8", mode="a+") as idx:
+        idx.write(f"({view_id})\n")
     if config.check is True:
         print(
             f'fallback: {config.SUCCESS_COLOR}Downloaded all recent files of \
diff --git a/Modules/functions.py b/Modules/functions.py
index 0d58943..6b75481 100644
--- a/Modules/functions.py
+++ b/Modules/functions.py
@@ -64,12 +64,19 @@ def system_message_handler(s):
             .text.strip()
         }
     except AttributeError:
-        message = (
-            s.find("section", class_="aligncenter notice-message")
-            .find("div", class_="section-body alignleft")
-            .find("div", class_="redirect-message")
-            .text.strip()
-        )
+        try:
+            message = (
+                s.find("section", class_="aligncenter notice-message")
+                .find("div", class_="section-body alignleft")
+                .find("div", class_="redirect-message")
+                .text.strip()
+            )
+        except AttributeError:
+            message = (
+                s.find("section", class_="aligncenter notice-message")
+                .find("div", class_="section-body alignleft")
+                .text.strip()
+            )
     print(f"{config.WARN_COLOR}System Message: {message}{config.END}")
     raise download_complete
 
diff --git a/Modules/index.py b/Modules/index.py
index 73fc039..a90da21 100644
--- a/Modules/index.py
+++ b/Modules/index.py
@@ -5,6 +5,7 @@ from pathlib import Path
 
 import Modules.config as config
 
+
 @lru_cache(maxsize=None)
 def start_indexing(path, layer=0):
 
@@ -19,15 +20,16 @@ def start_indexing(path, layer=0):
         # iter the directory
         for p in path.iterdir():
 
-            name = p.stem
             if p.is_file():
-                fname = re.search(r"\([0-9]{5,}\)", name)
-                if fname is None and name != "index":
+                name = p.stem
+                ext = p.suffix
+                match = re.search(r"\([0-9]{5,}\)", name)
+                if match is None and ext not in [".txt", ".idx"]:
                     return
 
-                if match := re.search(r"\([0-9]{5,}\)", name):
+                if match:
                     idx.write(f"{match[0]}\n")
-                    print(f"found: {p} by {match[0]}")
+                    print(f"found: {p}")
 
             elif p.is_dir():
                 start_indexing(p, layer + 1)