retry zero times

Author: AndreyNikiforov

src/icloudpd/base.py

@@ -1233,6 +1233,8 @@ def session_error_handle_builder(
 ) -> None:
     """Handles session errors in the PhotoAlbum photos iterator"""
     if "Invalid global session" in str(ex):
+        if constants.MAX_RETRIES == 0:
+            logger.error("Session error, re-authenticating...")
         if attempt > constants.MAX_RETRIES:
             logger.error("iCloud re-authentication failed. Please try again later.")
             raise ex

src/icloudpd/constants.py

@@ -3,5 +3,5 @@
 from typing import Final
 
 # For retrying connection after timeouts and errors
-MAX_RETRIES: Final[int] = 4
+MAX_RETRIES: Final[int] = 0
 WAIT_SECONDS: Final[int] = 5

src/icloudpd/download.py

@@ -112,7 +112,8 @@ def download_media(
     if not mkdirs_local(logger, download_path):
         return False
 
-    for retries in range(constants.MAX_RETRIES):
+    retries = 0
+    while True:
         try:
             photo_response = photo.download(version.url)
             if photo_response:
@@ -134,6 +135,9 @@ def download_media(
 
                 icloud.authenticate()
             else:
+                # short circuiting 0 retries
+                if retries == constants.MAX_RETRIES:
+                    break
                 # you end up here when p.e. throttling by Apple happens
                 wait_time = (retries + 1) * constants.WAIT_SECONDS
                 logger.error(
@@ -150,7 +154,10 @@ def download_media(
                 download_path,
             )
             break
-    else:
+        retries = retries + 1
+        if retries >= constants.MAX_RETRIES:
+            break
+    if retries >= constants.MAX_RETRIES:
         logger.error(
             "Could not download %s. Please try again later.",
             photo.filename,