Fix: Download filtered album, if present, from all libraries when no …

…library is specified (#203)

* Download filtered album, if present, from all libraries

src/sync_photos.py

@@ -189,6 +189,21 @@ def sync_photos(config, photos):
                     files=files,
                     folder_format=folder_format,
                 )
+        elif filters["albums"]:
+            for album in iter(filters["albums"]):
+                if album in photos.libraries[library].albums:
+                    sync_album(
+                        album=photos.libraries[library].albums[album],
+                        destination_path=os.path.join(destination_path, album),
+                        file_sizes=filters["file_sizes"],
+                        extensions=filters["extensions"],
+                        files=files,
+                        folder_format=folder_format,
+                    )
+                else:
+                    LOGGER.warning(
+                        f"Album {album} not found in {library}. Skipping the album {album} ..."
+                    )
         else:
             sync_album(
                 album=photos.libraries[library].all,

tests/data/test_config.yaml

@@ -64,8 +64,8 @@ photos:
   all_albums: false # Optional, default false. If true preserve album structure. If same photo is in multpile albums creates duplicates on filesystem
   # folder_format: "%Y/%m" # optional, if set put photos in subfolders according to format. Format cheatsheet - https://strftime.org
   filters:
-    # libraries: # Optional, specify list of libraries to download photos from
-    #   - PrimarySync # Library of the user
+    libraries: # Optional, specify list of libraries to download photos from
+      - PrimarySync # Library of the user
     #   - SharedSync-abcd # Library of another user
     # if all_albums is false - albums list is used as filter-in, if all_albums is true - albums list is used as filter-out
     # if albums list is empty and all_albums is false download all photos to "all" folder. if empty and all_albums is true download all folders

tests/test_config_parser.py

@@ -448,6 +448,7 @@ def test_get_photos_folder_format_valid(self):
     def test_get_photos_filters_libraries_empty(self):
         """Photos > library is missing in config."""
         config = read_config(config_path=tests.CONFIG_PATH)
+        del config["photos"]["filters"]["libraries"]
         self.assertEqual(
             config_parser.get_photos_filters(config=config)["libraries"], None
         )

tests/test_sync_photos.py

@@ -656,6 +656,8 @@ def test_photo_download_with_shared_libraries(
         config = self.config.copy()
         config["photos"]["destination"] = self.destination_path
         del config["photos"]["filters"]["albums"]
+        # delete libraries from config
+        del config["photos"]["filters"]["libraries"]
         mock_read_config.return_value = config
         # Sync original photos
         self.assertIsNone(
@@ -667,3 +669,36 @@ def test_photo_download_with_shared_libraries(
         self.assertTrue(len(glob.glob(os.path.join(all_path, "IMG_3148*.JPG"))) > 0)
         # Check for shared photo
         self.assertTrue(len(glob.glob(os.path.join(all_path, "IMG_5513*.HEIC"))) > 0)
+
+    @patch(target="keyring.get_password", return_value=data.VALID_PASSWORD)
+    @patch(
+        target="src.config_parser.get_username", return_value=data.AUTHENTICATED_USER
+    )
+    @patch("icloudpy.ICloudPyService")
+    @patch("src.read_config")
+    def test_sync_photos_all_albums_filtered_missing_primary_sync(
+        self, mock_read_config, mock_service, mock_get_username, mock_get_password
+    ):
+        """Test for successful original photo size download."""
+        mock_service = self.service
+        config = self.config.copy()
+        config["photos"]["destination"] = self.destination_path
+        del config["photos"]["filters"]["libraries"]
+        config["photos"]["filters"]["albums"] += ["Favorites"]
+        mock_read_config.return_value = config
+        # Sync original photos
+        self.assertIsNone(
+            sync_photos.sync_photos(config=config, photos=mock_service.photos)
+        )
+        album_0_path = os.path.join(
+            self.destination_path, config["photos"]["filters"]["albums"][0]
+        )
+        album_1_path = os.path.join(
+            self.destination_path, config["photos"]["filters"]["albums"][1]
+        )
+        album_2_path = os.path.join(
+            self.destination_path, config["photos"]["filters"]["albums"][2]
+        )
+        self.assertTrue(os.path.isdir(album_0_path))
+        self.assertTrue(os.path.isdir(album_1_path))
+        self.assertTrue(os.path.isdir(album_2_path))