Add getconfigsetting support

Author: Piotr Slupski

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Check dependencies
       run: make doctor
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: .venv
         key: ${{ runner.os }}-poetry-${{ hashFiles('poetry.lock') }}

.github/workflows/release.yml

@@ -0,0 +1,59 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  release-build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+
+      - name: Build release distributions
+        run: python -m build
+
+      - name: Upload distributions
+        uses: actions/upload-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+  pypi-publish:
+    runs-on: ubuntu-latest
+    needs: release-build
+    permissions:
+      id-token: write  # Required for OIDC authentication
+
+    environment:
+      name: pypi
+      url: https://pypi.org/project/filecloudapi-python/
+
+    steps:
+      - name: Download release distributions
+        uses: actions/download-artifact@v4
+        with:
+          name: release-dists
+          path: dist/
+
+      - name: Publish to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          packages-dir: dist/

filecloudapi/fcserver.py

@@ -616,32 +616,43 @@ def upload_bytes(
         data: bytes,
         serverpath: str,
         datemodified: datetime.datetime = datetime.datetime.now(),
+        nofileoverwrite: Optional[bool] = False,
+        iflastmodified: Optional[datetime.datetime] = None,
         progress: Optional[Progress] = None,
     ) -> None:
         """
         Upload bytes 'data' to server at 'serverpath'.
         """
-        self.upload(BufferedReader(BytesIO(data)), serverpath, datemodified, progress=progress)  # type: ignore
+        self.upload(BufferedReader(BytesIO(data)), serverpath, datemodified, nofileoverwrite=nofileoverwrite, iflastmodified=iflastmodified, progress=progress)  # type: ignore
 
     def upload_str(
         self,
         data: str,
         serverpath: str,
         datemodified: datetime.datetime = datetime.datetime.now(),
+        nofileoverwrite: Optional[bool] = False,
+        iflastmodified: Optional[datetime.datetime] = None,
         progress: Optional[Progress] = None,
     ) -> None:
         """
         Upload str 'data' UTF-8 encoded to server at 'serverpath'.
         """
         self.upload_bytes(
-            data.encode("utf-8"), serverpath, datemodified, progress=progress
+            data.encode("utf-8"),
+            serverpath,
+            datemodified,
+            nofileoverwrite=nofileoverwrite,
+            iflastmodified=iflastmodified,
+            progress=progress,
         )
 
     def upload_file(
         self,
         localpath: pathlib.Path,
         serverpath: str,
         datemodified: datetime.datetime = datetime.datetime.now(),
+        nofileoverwrite: Optional[bool] = False,
+        iflastmodified: Optional[datetime.datetime] = None,
         adminproxyuserid: Optional[str] = None,
         progress: Optional[Progress] = None,
     ) -> None:
@@ -653,6 +664,8 @@ def upload_file(
                 uploadf,
                 serverpath,
                 datemodified,
+                nofileoverwrite,
+                iflastmodified,
                 adminproxyuserid=adminproxyuserid,
                 progress=progress,
             )
@@ -672,6 +685,8 @@ def upload(
         uploadf: BufferedReader,
         serverpath: str,
         datemodified: datetime.datetime,
+        nofileoverwrite: Optional[bool] = False,
+        iflastmodified: Optional[datetime.datetime] = None,
         adminproxyuserid: Optional[str] = None,
         progress: Optional[Progress] = None,
     ) -> None:
@@ -801,6 +816,13 @@ def close(self):
                 "date": self._serverdatetime(datemodified),
                 "adminproxyuserid": adminproxyuserid,
             }
+
+            if nofileoverwrite is not None:
+                params["nofileoverwrite"] = 1 if nofileoverwrite else 0
+
+            if iflastmodified is not None:
+                params["iflastmodified"] = str(int(iflastmodified.timestamp()))
+
             params_str = urlencode(params)
 
             if params_str.find("%2FSHARED%2F%21"):
@@ -843,6 +865,12 @@ def close(self):
                 "adminproxyuserid": adminproxyuserid,
             }
 
+            if nofileoverwrite is not None:
+                params["nofileoverwrite"] = 1 if nofileoverwrite else 0
+
+            if iflastmodified is not None:
+                params["iflastmodified"] = str(int(iflastmodified.timestamp()))
+
             if data_size is not None:
                 params["filesize"] = data_size
 
@@ -903,6 +931,34 @@ def share(self, path: str, adminproxyuserid: str = "") -> FCShare:
             str_to_bool(resp.findtext("./share/allowpublicuploadonly", "")),
         )
 
+    def quickshare(self, sharelocation: str, adminproxyuserid: str = "") -> FCShare:
+        """
+        Quick Share 'sharelocation'
+        """
+        resp = self._api_call(
+            "/core/quickshare",
+            {"sharelocation": sharelocation, "adminproxyuserid": adminproxyuserid},
+        )
+
+        shareid = resp.findtext("./share/shareid", "")
+
+        if not shareid:
+            msg = resp.findtext("./meta/message", "")
+            if msg:
+                raise ServerError("", msg)
+            else:
+                raise ServerError("", "No shareid in response")
+
+        return FCShare(
+            shareid,
+            resp.findtext("./share/sharename", ""),
+            resp.findtext("./share/sharelocation", ""),
+            str_to_bool(resp.findtext("./share/allowpublicaccess", "")),
+            str_to_bool(resp.findtext("./share/allowpublicupload", "")),
+            str_to_bool(resp.findtext("./share/allowpublicviewonly", "")),
+            str_to_bool(resp.findtext("./share/allowpublicuploadonly", "")),
+        )
+
     def getshareforpath(self, path: str, adminproxyuserid: str = "") -> FCShare:
         """
         Share 'path'
@@ -971,6 +1027,15 @@ def adduserstoshare(
 
         self._raise_exception_from_command(resp)
 
+    def addgrouptoshare(self, share: FCShare, groupid: str) -> None:
+        """
+        Allow group access to share
+        """
+        resp = self._api_call(
+            "/core/addgrouptoshare", {"shareid": share.shareid, "groupid": groupid}
+        )
+        self._raise_exception_from_command(resp)
+
     def createfolder(
         self,
         path: str,
@@ -1044,6 +1109,35 @@ def setuseraccessforshare(
         )
         self._raise_exception_from_command(resp)
 
+    def setgroupaccessforshare(
+        self,
+        share: FCShare,
+        groupid: str,
+        allowwrite: bool,
+        allowdownload: bool,
+        allowshare: bool,
+        allowsync: bool,
+        disallowdelete: bool,
+        adminproxyuserid: Optional[str] = None,
+    ) -> None:
+        """
+        Set group permissions for share
+        """
+        resp = self._api_call(
+            "/core/setgroupaccessforshare",
+            {
+                "shareid": share.shareid,
+                "groupid": groupid,
+                "write": "true" if allowwrite else "false",
+                "download": "true" if allowdownload else "false",
+                "share": "true" if allowshare else "false",
+                "sync": "true" if allowsync else "false",
+                "disallowdelete": "true" if disallowdelete else "false",
+                "adminproxyuserid": adminproxyuserid if adminproxyuserid else "",
+            },
+        )
+        self._raise_exception_from_command(resp)
+
     def getusersforshare(self, share: FCShare) -> list[FCShareUser]:
         """
         Returns a list of users that are added explicitly to the share
@@ -1585,7 +1679,7 @@ def get_config_settings(self, config: list[str]) -> None:
             config_opts[param_key] = config[i]
 
         resp = self._api_call(
-            "/admin/setconfigsetting",
+            "/admin/getconfigsetting",
             {
                 "count": str(len(config_opts)),
                 **{f"param{i}": value for i, value in enumerate(config_opts)},