fix ignored photos with --delete-after-download or --keep-icloud-recent-days (#1096)

Author: iowk

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- fix: fix ignored photos with --delete-after-download or --keep-icloud-recent-days [#616](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/616)
 - fix: timeout set to 30 seconds for HTTP requests [#793](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/793)
 
 ## 1.27.4 (2025-04-15)

src/icloudpd/base.py

@@ -1403,6 +1403,8 @@ def should_break(counter: Counter) -> bool:
                         )
 
                         retrier(delete_local, error_handler)
+                        if photos.direction != "DESCENDING":
+                            photos.increment_offset(-1)
 
                     photos_counter += 1
                     status_exchange.get_progress().photos_counter = photos_counter

src/pyicloud_ipd/services/photos.py

@@ -349,6 +349,10 @@ def __init__(self, service:PhotosService, service_endpoint: str, name: str, list
         self.list_type = list_type
         self.obj_type = obj_type
         self.direction = direction
+        if self.direction == "DESCENDING":
+            self.offset = len(self) - 1
+        else:
+            self.offset = 0
         self.query_filter = query_filter
         self.page_size = page_size
         self.exception_handler: Optional[Callable[[Exception, int], None]] = None
@@ -386,30 +390,25 @@ def __len__(self) -> int:
 
     # Perform the request in a separate method so that we
     # can mock it to test session errors.
-    def photos_request(self, offset: int) -> Response:
+    def photos_request(self) -> Response:
         url = ('%s/records/query?' % self.service_endpoint) + \
             urlencode(self.service.params)
         return self.service.session.post(
             url,
             data=json.dumps(self._list_query_gen(
-                offset, self.list_type, self.direction,
+                self.offset, self.list_type, self.direction,
                 self.query_filter)),
             headers={'Content-type': 'text/plain'}
         )
 
 
     @property
     def photos(self) -> Generator["PhotoAsset", Any, None]:
-        if self.direction == "DESCENDING":
-            offset = len(self) - 1
-        else:
-            offset = 0
-
         exception_retries = 0
 
         while(True):
             try:
-                request = self.photos_request(offset)
+                request = self.photos_request()
             except PyiCloudAPIResponseException as ex:
                 if self.exception_handler:
                     exception_retries += 1
@@ -446,18 +445,20 @@ def photos(self) -> Generator["PhotoAsset", Any, None]:
 
             master_records_len = len(master_records)
             if master_records_len:
-                if self.direction == "DESCENDING":
-                    offset = offset - master_records_len
-                else:
-                    offset = offset + master_records_len
-
                 for master_record in master_records:
                     record_name = master_record['recordName']
                     yield PhotoAsset(self.service, master_record,
                                      asset_records[record_name])
+                    self.increment_offset(1)
             else:
                 break
 
+    def increment_offset(self, value: int) -> None:
+        if self.direction == "DESCENDING":
+            self.offset -= value
+        else:
+            self.offset += value
+
     def _count_query_gen(self, obj_type: str) -> Dict[str, Any]:
         query = {
             u'batch': [{

tests/test_download_photos.py

@@ -491,7 +491,7 @@ def mocked_authenticate(self: PyiCloudService) -> None:
     def test_handle_session_error_during_photo_iteration(self) -> None:
         base_dir = os.path.join(self.fixtures_path, inspect.stack()[0][3])
 
-        def mock_raise_response_error(_offset: int) -> NoReturn:
+        def mock_raise_response_error() -> NoReturn:
             raise PyiCloudAPIResponseException("Invalid global session", "100")
 
         with mock.patch("time.sleep") as sleep_mock:  # noqa: SIM117
@@ -1760,7 +1760,7 @@ def mock_raise_response_error(_arg: Any) -> NoReturn:
     def test_handle_internal_error_during_photo_iteration(self) -> None:
         base_dir = os.path.join(self.fixtures_path, inspect.stack()[0][3])
 
-        def mock_raise_response_error(_offset: int) -> NoReturn:
+        def mock_raise_response_error() -> NoReturn:
             raise PyiCloudAPIResponseException("INTERNAL_ERROR", "INTERNAL_ERROR")
 
         with mock.patch("time.sleep") as sleep_mock:  # noqa: SIM117

tests/test_download_photos_id.py

@@ -491,7 +491,7 @@ def mocked_authenticate(self: PyiCloudService) -> None:
     def test_handle_session_error_during_photo_iteration_name_id7(self) -> None:
         base_dir = os.path.join(self.fixtures_path, inspect.stack()[0][3])
 
-        def mock_raise_response_error(_offset: int) -> NoReturn:
+        def mock_raise_response_error() -> NoReturn:
             raise PyiCloudAPIResponseException("Invalid global session", "100")
 
         with mock.patch("time.sleep") as sleep_mock:  # noqa: SIM117
@@ -1744,7 +1744,7 @@ def mock_raise_response_error(_arg: Any) -> NoReturn:
     def test_handle_internal_error_during_photo_iteration_name_id7(self) -> None:
         base_dir = os.path.join(self.fixtures_path, inspect.stack()[0][3])
 
-        def mock_raise_response_error(_offset: int) -> NoReturn:
+        def mock_raise_response_error() -> NoReturn:
             raise PyiCloudAPIResponseException("INTERNAL_ERROR", "INTERNAL_ERROR")
 
         with mock.patch("time.sleep") as sleep_mock:  # noqa: SIM117