icloudpy upgraded to 0.6.0 and unraid template updated to set ENV_ICL…

…OUD_PASSWORD as optional (#254)

.github/workflows/ci-pr-test.yml

@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Cache pip dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-dependencies
         with:
           path: ~/.cache/pip
@@ -41,13 +41,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Python 3.10
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - name: Restore pip cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements*.txt') }}
@@ -56,11 +56,11 @@ jobs:
       - name: Install dependencies
         run: |
           pip install -r requirements-test.txt
-      #      - name: Setup tmate session
-      #       uses: mxschmitt/action-tmate@v3
       - name: Test with pytest
         run: |
-          sudo mkdir /config /icloud && sudo chown -R $(id -u) /config /icloud && pylint src/ tests/ && pytest
+          sudo mkdir /config /icloud && sudo chown -R $(id -u):$(id -g) /config /icloud && pylint src/ tests/ && ENV_CONFIG_FILE_PATH=./tests/data/test_config.yaml pytest
+      # - name: Setup tmate session
+      #   uses: mxschmitt/action-tmate@v3
       - name: Generate Allure Report
         uses: simple-elf/allure-report-action@master
         if: always()
@@ -70,13 +70,13 @@ jobs:
           keep_reports: 100
       - name: Upload tests artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: tests-output
           path: allure-history
           retention-days: 1
       - name: Upload coverage artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ success() }}
         with:
           name: coverage-output

requirements.txt

@@ -1,4 +1,4 @@
-icloudpy==0.5.0
+icloudpy==0.6.0
 ruamel.yaml==0.16.12
 python-magic==0.4.27
 requests~=2.28.1

tests/data/__init__.py

@@ -3886,7 +3886,7 @@ def request(self, method, url, **kwargs):
         if "com.apple.photos.cloud" in url:
             if url.endswith("zones/list"):
                 return ResponseMock(ZONES_LIST_WORKING)
-            if "query?remapEnums=True&getCurrentSyncToken=True" in url:
+            if url.endswith("remapEnums=True&getCurrentSyncToken=True"):
                 if data.get("query").get("recordType") == "CheckIndexingState":
                     return ResponseMock(
                         photos_data.DATA[

unraid/icloud.xml

@@ -28,6 +28,6 @@
   <Config Name="PGID" Target="PGID" Default="100" Mode="" Description="" Type="Variable" Display="always" Required="false" Mask="false">100</Config>
   <Config Name="Configuration Files" Target="/config" Default="/mnt/user/appdata/icloud/config" Mode="rw" Description="Storage for all the configuration files (e.g. config.yaml, session_data directory etc.)" Type="Path" Display="always" Required="true" Mask="false">/mnt/user/appdata/icloud/config</Config>
   <Config Name="iCloud data storage directory" Target="/icloud" Default="/mnt/user/backup/icloud" Mode="rw" Description="Target location to store your icloud data" Type="Path" Display="always" Required="true" Mask="false">&lt;provide location to icloud backup&gt;</Config>
-  <Config Name="Your iCloud Password" Target="ENV_ICLOUD_PASSWORD" Default="" Mode="" Description="Your icloud.com password" Type="Variable" Display="always" Required="true" Mask="true">&lt;your icloud.com password&gt;</Config>
+  <Config Name="Your iCloud Password" Target="ENV_ICLOUD_PASSWORD" Default="" Mode="" Description="Your icloud.com password" Type="Variable" Display="always" Required="false" Mask="true">&lt;your icloud.com password&gt;</Config>
   <Config Name="Path to configuration file in container" Target="ENV_CONFIG_FILE_PATH" Default="/config/config.yaml" Mode="" Description="Path to configuration file in container - DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING!" Type="Variable" Display="advanced-hide" Required="true" Mask="false">/config/config.yaml</Config>
 </Container>