add new thumbnail flag

README.md

@@ -52,6 +52,9 @@ Options:
                                   Download live photos)
   --force-size                    Only download the requested size (default:
                                   download original if size is not available)
+  --thumbnail                     Only download the first photo as thumbnail 
+                                  of album as it is shown in the device 
+                                  (-a, --album option is required)
   --auto-delete                   Scans the "Recently Deleted" folder and
                                   deletes any files found in there. (If you
                                   restore the photo in iCloud, it will be

icloudpd/base.py

@@ -193,6 +193,11 @@
     type=click.IntRange(1),
     default=1,
 )
+@click.option(
+    "--thumbnail",
+    help="Get the first photo of album as thumbnail as is shown in the device",
+    is_flag=True,
+)
 @click.version_option()
 # pylint: disable-msg=too-many-arguments,too-many-statements
 # pylint: disable-msg=too-many-branches,too-many-locals
@@ -224,6 +229,7 @@ def main(
         no_progress_bar,
         notification_script,
         threads_num,    # pylint: disable=W0613
+        thumbnail,
 ):
     """Download all iCloud photos to a local directory"""
 
@@ -321,6 +327,10 @@ def photos_exception_handler(ex, retries):
 
     photos_count = len(photos)
 
+    if thumbnail and album is not None:
+        photos = itertools.islice(photos, photos.page_size-1, photos.page_size)
+        photos_count = 1
+
     # Optional: Only download the x most recent photos.
     if recent is not None:
         photos_count = recent
@@ -334,9 +344,9 @@ def photos_exception_handler(ex, retries):
         # ensure photos iterator doesn't have a known length
         photos = (p for p in photos)
 
-    plural_suffix = "" if photos_count == 1 else "s"
+    plural_suffix = "" if photos_count == 1 or thumbnail else "s"
     video_suffix = ""
-    photos_count_str = "the first" if photos_count == 1 else photos_count
+    photos_count_str = "the first" if photos_count == 1 else "thumbnail" if thumbnail else photos_count
     if not skip_videos:
         video_suffix = " or video" if photos_count == 1 else " and videos"
     logger.info(

tests/test_download_photos.py

@@ -1295,3 +1295,51 @@ def test_download_chinese(self):
                 photo_modified_time.strftime('%Y-%m-%d %H:%M:%S'))
 
             assert result.exit_code == 0
+
+    def test_get_thumbnail_photo_of_album(self):
+        base_dir = os.path.normpath(f"tests/fixtures/Photos/{inspect.stack()[0][3]}")
+        if os.path.exists(base_dir):
+            shutil.rmtree(base_dir)
+        os.makedirs(base_dir)
+
+        with vcr.use_cassette("tests/vcr_cassettes/listing_photos.yml"):
+            # Pass fixed client ID via environment variable
+
+            def mock_raise_response_error():
+                raise PyiCloudAPIResponseError("Api Error", 100)
+
+            with mock.patch.object(PhotosService, "_fetch_folders") as pa_photos_request:
+                pa_photos_request.side_effect = mock_raise_response_error
+
+                # Let the initial authenticate() call succeed,
+                # but do nothing on the second try.
+                orig_authenticate = PyiCloudService.authenticate
+
+                def mocked_authenticate(self):
+                    if not hasattr(self, "already_authenticated"):
+                        orig_authenticate(self)
+                        setattr(self, "already_authenticated", True)
+
+                with mock.patch("icloudpd.constants.WAIT_SECONDS", 0):
+                    with mock.patch.object(
+                        PyiCloudService, "authenticate", new=mocked_authenticate
+                    ):
+                        runner = CliRunner(env={
+                            "CLIENT_ID": "DE309E26-942E-11E8-92F5-14109FE0B321"
+                        })
+                        result = runner.invoke(
+                            main,
+                            [
+                                "--username",
+                                "[email protected]",
+                                "--password",
+                                "password1",
+                                "--no-progress-bar",
+                                "--thumbnail",
+                                "--threads-num",
+                                1,
+                                "-d",
+                                base_dir,
+                            ],
+                        )
+                        print_result_exception(result)