From 4a2ccfa507981f7a3b4a2b7b406f03fb35242674 Mon Sep 17 00:00:00 2001
From: Radiquum <kentai.waah@gmail.com>
Date: Mon, 11 Jul 2022 19:41:19 +0500
Subject: [PATCH] small changes

---
 Modules/download.py  | 20 ++++++++++++++++++--
 Modules/functions.py |  2 +-
 Modules/index.py     | 17 +++++++++++++----
 furaffinity-dl.py    |  6 ++----
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/Modules/download.py b/Modules/download.py
index 43b9b4b..7ad3b35 100644
--- a/Modules/download.py
+++ b/Modules/download.py
@@ -27,8 +27,15 @@ def download(path):
     # System messages
     if s.find(class_="notice-message") is not None:
         system_message_handler(s)
+    try:
+        image = s.find(class_="download").find("a").attrs.get("href")
+    except AttributeError:
+        print(
+            f"{config.ERROR_COLOR}uncessesful download of {config.BASE_URL}{path}{config.END}"
+        )
+        download(path)
+        return True
 
-    image = s.find(class_="download").find("a").attrs.get("href")
     filename = sanitize_filename(image.split("/")[-1:][0])
 
     author = s.find(class_="submission-id-sub-container").find("a").find("strong").text
@@ -51,7 +58,13 @@ def download(path):
         output_path = f"{output}/{rating}/{title} ({view_id}) - {filename}"
         output_path_fb = f"{output}/{rating}/{title} - {filename}"
 
-    if config.dont_redownload is True and os.path.isfile(output_path_fb):
+    if config.dont_redownload is True and (
+        os.path.isfile(output_path_fb) or os.path.isfile(output_path)
+    ):
+        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}"
@@ -62,6 +75,9 @@ def download(path):
 [{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")
         if config.json_description is True:
diff --git a/Modules/functions.py b/Modules/functions.py
index 4320826..0d58943 100644
--- a/Modules/functions.py
+++ b/Modules/functions.py
@@ -135,7 +135,7 @@ def next_button(page_url):
         next_button = s.find("a", class_="button standard right", text="Next")
         page_num = fav_next_button(s)
     print(
-        f"Downloading page {page_num} - {config.BASE_URL}/{next_button.parent.attrs['action']}"
+        f"Downloading page {page_num} - {config.BASE_URL}{next_button.parent.attrs['action']}"
     )
     return page_num
 
diff --git a/Modules/index.py b/Modules/index.py
index 57fc959..73fc039 100644
--- a/Modules/index.py
+++ b/Modules/index.py
@@ -1,11 +1,13 @@
 import contextlib
 import re
+from functools import lru_cache
 from pathlib import Path
 
 import Modules.config as config
 
-
+@lru_cache(maxsize=None)
 def start_indexing(path, layer=0):
+
     """Recursively iterate over each item in path
     and print item's name.
     """
@@ -17,21 +19,28 @@ def start_indexing(path, layer=0):
         # iter the directory
         for p in path.iterdir():
 
+            name = p.stem
             if p.is_file():
-                idx.write(f"{p}\n")
+                fname = re.search(r"\([0-9]{5,}\)", name)
+                if fname is None and name != "index":
+                    return
+
+                if match := re.search(r"\([0-9]{5,}\)", name):
+                    idx.write(f"{match[0]}\n")
+                    print(f"found: {p} by {match[0]}")
 
             elif p.is_dir():
                 start_indexing(p, layer + 1)
-
             else:
                 raise FileNotFoundError()
 
 
+@lru_cache(maxsize=None)
 def check_file(path):
     view_id = path.split("/")[-2:-1][0]
     with contextlib.suppress(FileNotFoundError):
         with open(f"{config.output_folder}/index.idx", encoding="utf-8") as idx:
             index = idx.read()
-            match = re.search(view_id, index)
+            match = re.search(rf"\({view_id}\)", index)
         if match is not None:
             return True
diff --git a/furaffinity-dl.py b/furaffinity-dl.py
index 234d235..294f8fa 100644
--- a/furaffinity-dl.py
+++ b/furaffinity-dl.py
@@ -69,7 +69,7 @@ downloaded - {config.BASE_URL}{img_url}{config.END}'
                     if config.check is True:
                         print(
                             f'{config.SUCCESS_COLOR}Downloaded all recent files of \
-"{config.username[0]}"{config.END}'
+"{username}"{config.END}'
                         )
                         raise download_complete
                     print(
@@ -164,11 +164,9 @@ or provide a file with usernames (1 username per line){config.END}"
         if username != "":
             print(f'{config.SUCCESS_COLOR}Now downloading "{username}"{config.END}')
             download_url = f"{config.BASE_URL}/{config.category}/{username}"
+            print(f"Downloading page {config.start} - {download_url}/{config.start}")
             main()
             print(
                 f'{config.SUCCESS_COLOR}Finished \
 downloading "{username}"{config.END}'
             )
-    if os.path.isfile(f"{config.output_folder}/index.idx"):
-        os.remove(f"{config.output_folder}/index.idx")
-    start_indexing(config.output_folder)