Radiquum/furaffinity-dl
1
0
Fork 0
mirror of https://github.com/Radiquum/furaffinity-dl.git synced 2025-04-05 15:54:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Unable to find next button when downloading favourites Radiquum/furaffinity-dl#6

Browse source
This commit is contained in:
Kentai Radiquum 2024-10-29 23:24:58 +05:00
parent 79b6001106
commit 94df41eb44
Signed by: Radiquum
GPG key ID: 858E8EE696525EED
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Modules/download.py
View file

@ -12,7 +12,7 @@ from Modules.functions import system_message_handler
def download(path, max_retries=5): def download(path, max_retries=5):
if max_retries < 0: if max_retries <= 0:
return False return False
try: try:
response = requests_retry_session().get(f"{config.BASE_URL}{path}") 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}" f"{config.ERROR_COLOR}unsuccessful download of {config.BASE_URL}{path} remains retries {max_retries}{config.END}"
) )
return download(path, max_retries - 1) 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: except Exception as e:
print(f"{config.ERROR_COLOR}exception when download {config.BASE_URL}{path} remains retries {max_retries}, error {e}{config.END}") 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) return download(path, max_retries - 1)

26
Modules/functions.py
View file

@ -133,33 +133,17 @@ def next_button(page_url):
else: else:
print(f"{config.WARN_COLOR}Unable to find next button{config.END}") print(f"{config.WARN_COLOR}Unable to find next button{config.END}")
raise DownloadComplete raise DownloadComplete
elif config.category != "favorites": else:
parse_next_button = s.find("button", class_="button standard", text="Next") parse_next_button = s.find("button", class_="button standard", text="Next")
if parse_next_button is None or parse_next_button.parent is None: 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}") print(f"{config.WARN_COLOR}Unable to find next button{config.END}")
raise DownloadComplete raise DownloadComplete
page_num = parse_next_button.parent.attrs["action"].split("/")[-2] if config.category != "favorites":
else: page_num = parse_next_button.parent.attrs["action"].split("/")[-2]
parse_next_button = s.find("a", class_="button standard right", text="Next") else:
page_num = fav_next_button(parse_next_button) page_num = f"{parse_next_button.parent.attrs["action"].split("/")[-2]}/next"
print( print(
f"Downloading page {page_num}" f"Downloading page {page_num}"
) )
return 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"