Support multiple users and/or configs #1067 #923

.devcontainer/python/devcontainer.json

@@ -7,7 +7,7 @@
 	"features": {
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
 	},
-	"postCreateCommand": "sudo apt-get update && sudo apt-get install -y locales-all"
+	"postCreateCommand": "sudo apt-get update && sudo apt-get install -y locales-all && (curl -fsSL https://claude.ai/install.sh | bash)"
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},

.dockerignore

@@ -12,7 +12,9 @@ cron_script.sh
 .coverage
 .coverage.*
 .git
-tests/
 .venv
 venv
-create/
+create/
+Dockerfile.test-py310
+.dockerignore.test
+check_py310_compat.py

.github/workflows/build-package.yml

@@ -291,7 +291,6 @@ jobs:
       run: |
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.platform[1] }}
         mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.platform[1] }}
-        mv dist/icloudpd_ex dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.platform[1] }}
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
@@ -542,7 +541,6 @@ jobs:
       run: |
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.platform[1] }}
         mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.platform[1] }}
-        mv dist/icloudpd_ex dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.platform[1] }}
 
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
@@ -583,10 +581,8 @@ jobs:
       run: |
         scripts/build_bin2 icloudpd icloud  && \
         scripts/build_bin1 icloud && \
-        scripts/build_bin1 icloudpd_ex  && \
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-macos-amd64 && \
-        mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64 && \
-        mv dist/icloudpd_ex dist/icloudpd-ex-${{inputs.icloudpd_version}}-macos-amd64
+        mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64
 
     - name: Build Python Binary Wheel
       run: |
@@ -631,10 +627,8 @@ jobs:
       run: |
         scripts/build_bin2 icloudpd icloud  && \
         scripts/build_bin1 icloud && \
-        scripts/build_bin1 icloudpd_ex  && \
         mv dist/icloud dist/icloud-${{inputs.icloudpd_version}}-windows-amd64 && \
-        mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-windows-amd64 && \
-        mv dist/icloudpd_ex dist/icloudpd-ex-${{inputs.icloudpd_version}}-windows-amd64
+        mv dist/icloudpd dist/icloudpd-${{inputs.icloudpd_version}}-windows-amd64
 
     - name: Build Python Binary Wheel
       run: |
@@ -1450,13 +1444,10 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             echo "test icloud..." && 
             dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
             echo "test icloudpd..." && 
             dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
-            echo "test icloudpd-ex..." && 
-            dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
             touch /work/compatibility/bin.${{ matrix.image[0] }}.${{ matrix.prop[0] }}.pass 
 
       - name: Record failure for ${{ matrix.prop[2] }}${{ matrix.image[1] }} on ${{ matrix.prop[1] }} 
@@ -1489,7 +1480,6 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             echo "test icloudpd..." && 
             TZ=America/Los_Angeles LC_ALL=ru_RU.UTF-8 dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --use-os-locale --version 1>.result && 
             cat .result &&
@@ -1644,13 +1634,10 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             echo "test icloud..." && 
             dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
             echo "test icloudpd..." && 
             dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
-            echo "test icloudpd-ex..." && 
-            dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
             touch /work/compatibility/bin-musl.${{ matrix.image[0] }}.${{ matrix.prop[0] }}.pass 
 
       - name: Record failure for ${{ matrix.prop[2] }}${{ matrix.image[1] }} on ${{ matrix.prop[1] }} 
@@ -1683,7 +1670,6 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             echo "test icloudpd..." && 
             TZ=America/Los_Angeles LC_ALL=ru_RU.UTF-8 dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --use-os-locale --version 1>.result && 
             cat .result &&
@@ -1835,13 +1821,10 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             echo "test icloud..." && 
             dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
             echo "test icloudpd..." && 
             dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
-            echo "test icloudpd-ex..." && 
-            dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --version && 
             touch /work/compatibility/bin.${{ matrix.image[0] }}.${{ matrix.prop[0] }}.pass 
 
       - name: Record failure for ${{ matrix.prop[2] }}${{ matrix.image[1] }} on ${{ matrix.prop[1] }} 
@@ -1875,7 +1858,6 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} && 
             echo "test icloudpd..." && 
             TZ=America/Los_Angeles LC_ALL=ru_RU.UTF-8 dist/icloudpd-${{inputs.icloudpd_version}}-linux-${{ matrix.prop[0] }} --use-os-locale --version 1>.result && 
             cat .result &&
@@ -2027,13 +2009,10 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             echo "test icloud..." && 
             dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
             echo "test icloudpd..." && 
             dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
-            echo "test icloudpd-ex..." && 
-            dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --version && 
             touch /work/compatibility/bin-musl.${{ matrix.image[0] }}.${{ matrix.prop[0] }}.pass 
 
       - name: Record failure for ${{ matrix.prop[2] }}${{ matrix.image[1] }} on ${{ matrix.prop[1] }} 
@@ -2067,7 +2046,6 @@ jobs:
             cd /work && 
             chmod +x dist/icloud-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
-            chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} && 
             echo "test icloudpd..." && 
             TZ=America/Los_Angeles LC_ALL=ru_RU.UTF-8 dist/icloudpd-${{inputs.icloudpd_version}}-linux-musl-${{ matrix.prop[0] }} --use-os-locale --version 1>.result && 
             cat .result &&
@@ -2129,13 +2107,10 @@ jobs:
           echo "prep test..." && 
           chmod +x dist/icloud-${{inputs.icloudpd_version}}-macos-amd64 && 
           chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64 && 
-          chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-macos-amd64 && 
           echo "test icloud..." && 
           dist/icloud-${{inputs.icloudpd_version}}-macos-amd64 --version && 
           echo "test icloudpd..." && 
           dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64 --version && 
-          echo "test icloudpd-ex..." && 
-          dist/icloudpd-ex-${{inputs.icloudpd_version}}-macos-amd64 --version && 
           touch compatibility/bin.${{ matrix.prop[0] }}.${{ matrix.prop[1] }}.pass 
 
       - name: Record failure for ${{ matrix.prop[0] }} on amd64 
@@ -2158,7 +2133,6 @@ jobs:
           echo "prep test..." && 
           chmod +x dist/icloud-${{inputs.icloudpd_version}}-macos-amd64 && 
           chmod +x dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64 && 
-          chmod +x dist/icloudpd-ex-${{inputs.icloudpd_version}}-macos-amd64 && 
           echo "test icloudpd..." && 
           TZ=America/Los_Angeles LC_ALL=ru_RU.UTF-8 dist/icloudpd-${{inputs.icloudpd_version}}-macos-amd64 --use-os-locale --version 1>.result && 
           cat .result &&
@@ -2216,8 +2190,7 @@ jobs:
           dist/icloud-${{inputs.icloudpd_version}}-${{ matrix.prop[1] }}-amd64.exe --version && 
           echo "test icloudpd..." && 
           dist/icloudpd-${{inputs.icloudpd_version}}-${{ matrix.prop[1] }}-amd64.exe --version && 
-          echo "test icloudpd-ex..." && 
-          dist/icloudpd-ex-${{inputs.icloudpd_version}}-${{ matrix.prop[1] }}-amd64.exe --version && 
+
           touch compatibility/bin.${{ matrix.prop[0] }}.amd64.pass 
 
       - name: Record failure for ${{ matrix.prop[0] }} on amd64 

.gitignore

@@ -25,3 +25,5 @@ node_modules/
 # used for local troubleshooting
 .photos
 .cookies/
+
+.claude/

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- feat: support multiple user configurations in single command [#1067](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/1067) [#923](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/923)
+
 ## 1.31.0 (2025-08-20)
 
 - fix: OOMing on large downloads [#1214](https://github.com/icloud-photos-downloader/icloud_photos_downloader/issues/1214)

CONTRIBUTING.md

@@ -123,7 +123,6 @@ Building platform executables:
 ``` sh
 scripts/build_bin2 icloudpd icloud
 scripts/build_bin1 icloud
-scripts/build_bin1 icloudpd_ex
 ```
 Note: that command is for Linux, including devcontainers. Windows & macOS scripts must be executed on respective platforms.
 
@@ -132,7 +131,6 @@ Building Linux static executables:
 ``` sh
 scripts/build_static icloudpd
 scripts/build_static icloud
-scripts/build_static icloudpd_ex
 ```
 
 Building Python wheels (with executable):

Dockerfile

@@ -2,23 +2,50 @@ FROM alpine:3.18 AS runtime_amd64_none
 ENV MUSL_LOCPATH="/usr/share/i18n/locales/musl"
 RUN apk update && apk add --no-cache tzdata musl-locales musl-locales-lang
 WORKDIR /app
-COPY dist/icloudpd-ex-*.*.*-linux-musl-amd64 icloudpd_ex
+COPY dist/icloud-*.*.*-linux-musl-amd64 icloud
+COPY dist/icloudpd-*.*.*-linux-musl-amd64 icloudpd
 
 FROM alpine:3.18 AS runtime_arm64_none
 ENV MUSL_LOCPATH="/usr/share/i18n/locales/musl"
 RUN apk update && apk add --no-cache tzdata musl-locales musl-locales-lang
 WORKDIR /app
-COPY dist/icloudpd-ex-*.*.*-linux-musl-arm64 icloudpd_ex
+COPY dist/icloud-*.*.*-linux-musl-arm64 icloud
+COPY dist/icloudpd-*.*.*-linux-musl-arm64 icloudpd
 
 FROM alpine:3.18 AS runtime_arm_v7
 ENV MUSL_LOCPATH="/usr/share/i18n/locales/musl"
 RUN apk update && apk add --no-cache tzdata musl-locales musl-locales-lang
 WORKDIR /app
-COPY dist/icloudpd-ex-*.*.*-linux-musl-arm32v7 icloudpd_ex
+COPY dist/icloud-*.*.*-linux-musl-arm32v7 icloud
+COPY dist/icloudpd-*.*.*-linux-musl-arm32v7 icloudpd
 
 FROM runtime_${TARGETARCH}_${TARGETVARIANT:-none} AS runtime
 ENV TZ=UTC
 EXPOSE 8080
 WORKDIR /app
-RUN chmod +x /app/icloudpd_ex
-ENTRYPOINT ["/app/icloudpd_ex"]
+RUN chmod +x /app/icloud /app/icloudpd
+
+# Use a shell script to allow command selection
+COPY <<EOF /app/entrypoint.sh
+#!/bin/sh
+# If first argument is 'icloud' or 'icloudpd', run the corresponding binary
+case "\$1" in
+    icloud)
+        shift
+        exec /app/icloud "\$@"
+        ;;
+    icloudpd)
+        shift
+        exec /app/icloudpd "\$@"
+        ;;
+    *)
+        # Default to icloudpd
+        exec /app/icloudpd "\$@"
+        ;;
+esac
+EOF
+
+RUN chmod +x /app/entrypoint.sh
+
+# Default entrypoint allows command selection
+ENTRYPOINT ["/app/entrypoint.sh"]

Dockerfile.build

@@ -71,10 +71,8 @@ RUN \
     echo "Building binaries..." && \
     scripts/build_bin2 icloudpd icloud  && \
     scripts/build_bin1 icloud && \
-    scripts/build_bin1 icloudpd_ex  && \
     scripts/build_static icloudpd && \
     scripts/build_static icloud && \
-    scripts/build_static icloudpd_ex && \
     scripts/build_whl
 
 FROM scratch

Dockerfile.build-musl

@@ -50,7 +50,6 @@ RUN \
     . .venv/bin/activate && \
     scripts/build_bin2 icloudpd icloud  && \
     scripts/build_bin1 icloud && \
-    scripts/build_bin1 icloudpd_ex  && \
     scripts/build_whl
 
 FROM scratch

pyproject.toml

@@ -86,7 +86,7 @@ test = [
 Homepage="https://github.com/icloud-photos-downloader/icloud_photos_downloader"
 
 [project.scripts]
-icloudpd = "icloudpd.base:main"
+icloudpd = "icloudpd.cli:cli"
 icloud = "pyicloud_ipd.cmdline:main"
 
 [tool.pytest.ini_options]