feat: add --accept-apple-changes flag

--accept-apple-changes: re-download files when iCloud reports a
different version_size. Without this flag, version changes are
logged as warnings but files are not re-downloaded. Metadata
updates from iCloud are always applied regardless.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: teh-hippo

src/icloudpd/base.py

@@ -484,6 +484,7 @@ def password_provider(_username: str) -> str | None:
                     user_config.align_raw,
                     dir_cache,
                     manifest,
+                    user_config.accept_apple_changes,
                 )
                 if user_config.directory is not None
                 else (lambda _s, _c, _p: False)
@@ -901,6 +902,7 @@ def download_builder(
     raw_policy: RawTreatmentPolicy,
     dir_cache: DirCache,
     manifest: "ManifestDB | None",
+    accept_apple_changes: bool,
     icloud: PyiCloudService,
     counter: Counter,
     photo: PhotoAsset,
@@ -1011,15 +1013,24 @@ def download_builder(
                     )
                     dedup_download = dedup_suffix is not None and not file_exists
                     if dedup_suffix is None and manifest_row.version_size != version.size:
-                        # iCloud has a different version — re-download to the canonical path
-                        file_exists = False
-                        rel_path = os.path.relpath(download_path, directory)
-                        logger.debug(
-                            "%s version changed (manifest: %d, iCloud: %d), re-downloading",
-                            truncate_middle(download_path, 96),
-                            manifest_row.version_size,
-                            version.size,
-                        )
+                        # iCloud has a different version
+                        if accept_apple_changes:
+                            file_exists = False
+                            rel_path = os.path.relpath(download_path, directory)
+                            logger.info(
+                                "%s version changed (manifest: %d, iCloud: %d), re-downloading",
+                                truncate_middle(download_path, 96),
+                                manifest_row.version_size,
+                                version.size,
+                            )
+                        else:
+                            logger.warning(
+                                "%s version changed (manifest: %d, iCloud: %d), "
+                                "use --accept-apple-changes to re-download",
+                                truncate_middle(download_path, 96),
+                                manifest_row.version_size,
+                                version.size,
+                            )
                     elif dedup_suffix is None:
                         # No collision, version matches — update metadata if needed
                         meta = _extract_manifest_metadata(photo, version)

src/icloudpd/cli.py

@@ -312,6 +312,15 @@ def add_options_for_user(parser: argparse.ArgumentParser) -> argparse.ArgumentPa
         help="Don't download any photos (default: download all photos and videos)",
         action="store_true",
     )
+    cloned.add_argument(
+        "--accept-apple-changes",
+        help=(
+            "Re-download files when iCloud reports a different version. "
+            "Without this flag, version changes are logged as warnings. "
+            "Metadata updates from iCloud are always applied regardless."
+        ),
+        action="store_true",
+    )
     return cloned
 
 
@@ -560,6 +569,7 @@ def map_to_config(user_ns: argparse.Namespace) -> UserConfig:
         skip_created_before=user_ns.skip_created_before,
         skip_created_after=user_ns.skip_created_after,
         skip_photos=user_ns.skip_photos,
+        accept_apple_changes=user_ns.accept_apple_changes,
     )
 
 

src/icloudpd/config.py

@@ -51,6 +51,7 @@ class _DefaultConfig:
     skip_created_before: datetime.datetime | datetime.timedelta | None
     skip_created_after: datetime.datetime | datetime.timedelta | None
     skip_photos: bool
+    accept_apple_changes: bool
 
 
 @dataclass(kw_only=True)

tests/test_cli.py

@@ -235,6 +235,7 @@ def test_cli_parser(self) -> None:
                         skip_created_before=None,
                         skip_created_after=None,
                         skip_photos=False,
+                        accept_apple_changes=False,
                     ),
                     UserConfig(
                         directory="def",
@@ -276,6 +277,7 @@ def test_cli_parser(self) -> None:
                         skip_created_before=None,
                         skip_created_after=None,
                         skip_photos=False,
+                        accept_apple_changes=False,
                     ),
                 ],
             ),
@@ -355,6 +357,7 @@ def test_cli_parser(self) -> None:
                         ).astimezone(get_localzone()),
                         skip_created_after=datetime.timedelta(days=2),
                         skip_photos=False,
+                        accept_apple_changes=False,
                     ),
                 ],
             ),

tests/test_dedup_exif.py

@@ -175,6 +175,7 @@ def fake_download(
                 "--set-exif-datetime",
                 "--no-progress-bar",
                 "--threads-num", "1",
+                "--accept-apple-changes",
             ])
 
         self.assertIn("version changed", result.output)