From 94df41eb449882943b55b927e09dd7ce16572f70 Mon Sep 17 00:00:00 2001
From: Kentai Radiquum <kentai.waah@gmail.com>
Date: Tue, 29 Oct 2024 23:24:58 +0500
Subject: [PATCH] fix: Unable to find next button when downloading favourites
 Radiquum/furaffinity-dl#6

---
 Modules/download.py  |  7 ++++++-
 Modules/functions.py | 26 +++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Modules/download.py b/Modules/download.py
index 18642e5..1e21e7f 100644
--- a/Modules/download.py
+++ b/Modules/download.py
@@ -12,7 +12,7 @@ from Modules.functions import system_message_handler
 
 
 def download(path, max_retries=5):
-    if max_retries < 0:
+    if max_retries <= 0:
         return False
     try:
         response = requests_retry_session().get(f"{config.BASE_URL}{path}")
@@ -28,6 +28,11 @@ def download(path, max_retries=5):
             f"{config.ERROR_COLOR}unsuccessful download of {config.BASE_URL}{path} remains retries {max_retries}{config.END}"
         )
         return download(path, max_retries - 1)
+    except DownloadComplete:
+        print(
+            f"{config.ERROR_COLOR}unsuccessful download of {config.BASE_URL}{path}. Maybe you need to log in?{config.END}"
+        )
+        return False
     except Exception as e:
         print(f"{config.ERROR_COLOR}exception when download {config.BASE_URL}{path} remains retries {max_retries}, error {e}{config.END}")
         return download(path, max_retries - 1)
diff --git a/Modules/functions.py b/Modules/functions.py
index f1b2601..3434583 100644
--- a/Modules/functions.py
+++ b/Modules/functions.py
@@ -133,33 +133,17 @@ def next_button(page_url):
         else:
             print(f"{config.WARN_COLOR}Unable to find next button{config.END}")
             raise DownloadComplete
-    elif config.category != "favorites":
+    else:
         parse_next_button = s.find("button", class_="button standard", text="Next")
         if parse_next_button is None or parse_next_button.parent is None:
             print(f"{config.WARN_COLOR}Unable to find next button{config.END}")
             raise DownloadComplete
-        page_num = parse_next_button.parent.attrs["action"].split("/")[-2]
-    else:
-        parse_next_button = s.find("a", class_="button standard right", text="Next")
-        page_num = fav_next_button(parse_next_button)
+        if config.category != "favorites":
+            page_num = parse_next_button.parent.attrs["action"].split("/")[-2]
+        else:
+            page_num = f"{parse_next_button.parent.attrs["action"].split("/")[-2]}/next"
 
     print(
         f"Downloading page {page_num}"
     )
     return page_num
-
-
-def fav_next_button(parse_next_button):
-    # unlike galleries that are sequentially numbered, favorites use a different scheme.
-    # the "page_num" is instead: [set of numbers]/next (the trailing /next is required)
-    if parse_next_button is None:
-        print(f"{config.WARN_COLOR}Unable to find next button{config.END}")
-        raise DownloadComplete
-    next_page_link = parse_next_button.attrs["href"]
-    next_fav_num = re.findall(r"\d+", next_page_link)
-
-    if len(next_fav_num) <= 0:
-        print(f"{config.WARN_COLOR}Failed to parse next favorite link{config.END}")
-        raise DownloadComplete
-
-    return f"{next_fav_num[-1]}/next"