remove unnecessary scanning of albums (#1093)

Author: AndreyNikiforov

src/icloudpd/autodelete.py

@@ -43,7 +43,7 @@ def autodelete_photos(
     """
     logger.info("Deleting any files found in 'Recently Deleted'...")
 
-    recently_deleted = library_object.albums["Recently Deleted"]
+    recently_deleted = library_object.recently_deleted
 
     for media in recently_deleted:
         try:

src/pyicloud_ipd/services/photos.py

@@ -42,6 +42,12 @@ class PhotoLibrary(object):
             "direction": "ASCENDING",
             "query_filter": None
         }
+    RECENTLY_DELETED = {
+            "obj_type": "CPLAssetDeletedByExpungedDate",
+            "list_type": "CPLAssetAndMasterDeletedByExpungedDate",
+            "direction": "ASCENDING",
+            "query_filter": None
+        }
     SMART_FOLDERS = {
         "Time-lapse": {
             "obj_type": "CPLAssetInSmartAlbumByAssetDate:Timelapse",
@@ -140,12 +146,7 @@ class PhotoLibrary(object):
                 }
             }]
         },
-        "Recently Deleted": {
-            "obj_type": "CPLAssetDeletedByExpungedDate",
-            "list_type": "CPLAssetAndMasterDeletedByExpungedDate",
-            "direction": "ASCENDING",
-            "query_filter": None
-        },
+        "Recently Deleted": RECENTLY_DELETED,
         "Hidden": {
             "obj_type": "CPLAssetHiddenByAssetDate",
             "list_type": "CPLAssetAndMasterHiddenByAssetDate",
@@ -162,6 +163,7 @@ def __init__(self, service: "PhotosService", zone_id: Dict[str, Any], library_ty
 
         self._albums: Optional[Dict[str, PhotoAlbum]] = None
         self._all: Optional[PhotoAlbum] = None
+        self._recently_deleted: Optional[PhotoAlbum] = None
 
         url = ('%s/records/query?%s' %
                (self.service_endpoint, urlencode(self.service.params)))
@@ -243,10 +245,13 @@ def _fetch_folders(self) -> Sequence[Dict[str, Any]]:
     def all(self) -> "PhotoAlbum":
         if not self._all:
             self._all = PhotoAlbum(self.service, self.service_endpoint, "", zone_id=self.zone_id, **self.WHOLE_COLLECTION) # type: ignore[arg-type] # dynamically builing params
-            # need to pull all albums because existing recorded tests expect all albums to be pulled...
-            self.albums 
         return self._all
 
+    @property
+    def recently_deleted(self) -> "PhotoAlbum":
+        if not self._recently_deleted:
+            self._recently_deleted = PhotoAlbum(self.service, self.service_endpoint, "", zone_id=self.zone_id, **self.RECENTLY_DELETED) # type: ignore[arg-type] # dynamically builing params
+        return self._recently_deleted
 
 class PhotosService(PhotoLibrary):
     """The 'Photos' iCloud service.

tests/test_download_photos.py

@@ -622,7 +622,7 @@ def mocked_authenticate(self: PyiCloudService) -> None:
                         self.assertEqual,
                         self.root_path,
                         base_dir,
-                        "listing_photos.yml",
+                        "listing_albums.yml",
                         [],
                         [],
                         [

tests/test_download_photos_id.py

@@ -623,7 +623,7 @@ def mocked_authenticate(self: PyiCloudService) -> None:
                         self.assertEqual,
                         self.root_path,
                         base_dir,
-                        "listing_photos.yml",
+                        "listing_albums.yml",
                         [],
                         [],
                         [

tests/test_listing_recent_photos.py

@@ -269,10 +269,10 @@ def test_listing_recent_photos_with_missing_downloadURL(self) -> None:
                     mock_open.assert_called_once_with(
                         file="icloudpd-photo-error.json", mode="w", encoding="utf8"
                     )
-                    # Multiple JSON "dumps" occur with the new pyicloud 1.0.0 implementation
-                    # mock_json.assert_called_once()
+                    mock_json.assert_called()
+                    self.assertEqual(len(mock_json.call_args_list), 7)
                     # Check a few keys in the dict
-                    first_arg = mock_json.call_args_list[7][0][0]
+                    first_arg = mock_json.call_args_list[6][0][0]
                     self.assertEqual(
                         first_arg["master_record"]["recordName"], "AY6c+BsE0jjaXx9tmVGJM1D2VcEO"
                     )