Merge branch 'main' into fix/to_gif

Author: bigcat88

.github/workflows/analysis-coverage.yml

@@ -106,7 +106,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: apps/app_api
-          repository: cloud-py-api/app_api
+          repository: nextcloud/app_api
+          ref: stable29
 
       - name: Install AppAPI
         run: |
@@ -248,7 +249,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: apps/app_api
-          repository: cloud-py-api/app_api
+          repository: nextcloud/app_api
+          ref: stable29
 
       - name: Install AppAPI
         run: |
@@ -390,7 +392,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           path: apps/app_api
-          repository: cloud-py-api/app_api
+          repository: nextcloud/app_api
+          ref: stable29
 
       - name: Install AppAPI
         run: |
@@ -525,10 +528,19 @@ jobs:
         run: python3 -m pip -v install ".[dev]"
 
       - name: Checkout AppAPI
+        if: ${{ matrix.nextcloud != 'master' }}
         uses: actions/checkout@v4
         with:
           path: apps/app_api
-          repository: cloud-py-api/app_api
+          repository: nextcloud/app_api
+          ref: stable29
+
+      - name: Checkout AppAPI
+        if: ${{ matrix.nextcloud == 'master' }}
+        uses: actions/checkout@v4
+        with:
+          path: apps/app_api
+          repository: nextcloud/app_api
 
       - name: Install AppAPI
         run: |
@@ -692,10 +704,19 @@ jobs:
         run: python3 -m pip -v install ".[dev]"
 
       - name: Checkout AppAPI
+        if: ${{ matrix.nextcloud != 'master' }}
+        uses: actions/checkout@v4
+        with:
+          path: apps/app_api
+          repository: nextcloud/app_api
+          ref: stable29
+
+      - name: Checkout AppAPI
+        if: ${{ matrix.nextcloud == 'master' }}
         uses: actions/checkout@v4
         with:
           path: apps/app_api
-          repository: cloud-py-api/app_api
+          repository: nextcloud/app_api
 
       - name: Install AppAPI
         run: |

nc_py_api/_session.py

@@ -301,7 +301,7 @@ def _response_event(self, response: Response) -> None:
 
     def download2fp(self, url_path: str, fp, dav: bool, params=None, **kwargs):
         adapter = self.adapter_dav if dav else self.adapter
-        with adapter.stream("GET", url_path, params=params) as response:
+        with adapter.stream("GET", url_path, params=params, headers=kwargs.get("headers", None)) as response:
             check_error(response)
             for data_chunk in response.iter_raw(chunk_size=kwargs.get("chunk_size", 5 * 1024 * 1024)):
                 fp.write(data_chunk)
@@ -425,7 +425,7 @@ async def _response_event(self, response: Response) -> None:
 
     async def download2fp(self, url_path: str, fp, dav: bool, params=None, **kwargs):
         adapter = self.adapter_dav if dav else self.adapter
-        async with adapter.stream("GET", url_path, params=params) as response:
+        async with adapter.stream("GET", url_path, params=params, headers=kwargs.get("headers", None)) as response:
             check_error(response)
             async for data_chunk in response.aiter_raw(chunk_size=kwargs.get("chunk_size", 5 * 1024 * 1024)):
                 fp.write(data_chunk)

nc_py_api/files/files.py

@@ -115,9 +115,14 @@ def download_directory_as_zip(self, path: str | FsNode, local_path: str | Path |
         path = path.user_path if isinstance(path, FsNode) else path
         result_path = local_path if local_path else os.path.basename(path)
         with open(result_path, "wb") as fp:
-            self._session.download2fp(
-                "/index.php/apps/files/ajax/download.php", fp, dav=False, params={"dir": path}, **kwargs
-            )
+            if self._session.nc_version["major"] >= 31:
+                full_path = dav_get_obj_path(self._session.user, path)
+                accept_header = f"application/{kwargs.get('format', 'zip')}"
+                self._session.download2fp(quote(full_path), fp, dav=True, headers={"Accept": accept_header})
+            else:
+                self._session.download2fp(
+                    "/index.php/apps/files/ajax/download.php", fp, dav=False, params={"dir": path}, **kwargs
+                )
         return Path(result_path)
 
     def upload(self, path: str | FsNode, content: bytes | str) -> FsNode:

nc_py_api/files/files_async.py

@@ -119,9 +119,14 @@ async def download_directory_as_zip(
         path = path.user_path if isinstance(path, FsNode) else path
         result_path = local_path if local_path else os.path.basename(path)
         with open(result_path, "wb") as fp:
-            await self._session.download2fp(
-                "/index.php/apps/files/ajax/download.php", fp, dav=False, params={"dir": path}, **kwargs
-            )
+            if (await self._session.nc_version)["major"] >= 31:
+                full_path = dav_get_obj_path(await self._session.user, path)
+                accept_header = f"application/{kwargs.get('format', 'zip')}"
+                await self._session.download2fp(quote(full_path), fp, dav=True, headers={"Accept": accept_header})
+            else:
+                await self._session.download2fp(
+                    "/index.php/apps/files/ajax/download.php", fp, dav=False, params={"dir": path}, **kwargs
+                )
         return Path(result_path)
 
     async def upload(self, path: str | FsNode, content: bytes | str) -> FsNode: