From 35583c7f82fe1384362e2f61f4ff7ac5632f1b6c Mon Sep 17 00:00:00 2001 From: "daniel.arabadji" Date: Mon, 10 Feb 2025 17:24:50 +0000 Subject: [PATCH 1/4] Added parameters to upload --- filecloudapi/fcserver.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/filecloudapi/fcserver.py b/filecloudapi/fcserver.py index f3e0241..77a8376 100644 --- a/filecloudapi/fcserver.py +++ b/filecloudapi/fcserver.py @@ -671,6 +671,8 @@ def upload( uploadf: BufferedReader, serverpath: str, datemodified: datetime.datetime, + nofileoverwrite: bool = False, + iflastmodified: Optional[datetime.datetime] = None, adminproxyuserid: Optional[str] = None, progress: Optional[Progress] = None, ) -> None: @@ -799,6 +801,8 @@ def close(self): "filesize": 0, "date": self._serverdatetime(datemodified), "adminproxyuserid": adminproxyuserid, + "nofileoverwrite": nofileoverwrite, + "iflastmodified": self._serverdatetime(iflastmodified) if iflastmodified else None, } params_str = urlencode(params) From 225b5c2cb6691f3cd5ff55a61977a714655cfd32 Mon Sep 17 00:00:00 2001 From: DanielArabadjiFC Date: Tue, 11 Feb 2025 12:25:43 +0000 Subject: [PATCH 2/4] Incremented version and updated fcserver.py Incremented version --- filecloudapi/fcserver.py | 2 ++ pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/filecloudapi/fcserver.py b/filecloudapi/fcserver.py index 77a8376..b10c744 100644 --- a/filecloudapi/fcserver.py +++ b/filecloudapi/fcserver.py @@ -844,6 +844,8 @@ def close(self): "filename": name, "date": self._serverdatetime(datemodified), "adminproxyuserid": adminproxyuserid, + "nofileoverwrite": nofileoverwrite, + "iflastmodified": self._serverdatetime(iflastmodified) if iflastmodified else None, } if data_size is not None: diff --git a/pyproject.toml b/pyproject.toml index 94b48ce..2ae8af6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "filecloudapi-python" -version = "0.2.1" +version = "0.2.2" description = "A Python library to connect to a Filecloud server" packages = [{ include = "filecloudapi" }] From df8653bdbbe573f28970dc858906497f6cecd970 Mon Sep 17 00:00:00 2001 From: DanielArabadjiFC Date: Tue, 11 Feb 2025 12:33:43 +0000 Subject: [PATCH 3/4] Update pyproject.toml Incremented minor version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2ae8af6..7d81840 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "filecloudapi-python" -version = "0.2.2" +version = "0.3.0" description = "A Python library to connect to a Filecloud server" packages = [{ include = "filecloudapi" }] From 6c3e290183a82a627744220a7e5c1b1cd0c3af71 Mon Sep 17 00:00:00 2001 From: DanielArabadjiFC Date: Tue, 11 Feb 2025 13:10:30 +0000 Subject: [PATCH 4/4] Update fcserver.py Formatted --- filecloudapi/fcserver.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/filecloudapi/fcserver.py b/filecloudapi/fcserver.py index b10c744..986f191 100644 --- a/filecloudapi/fcserver.py +++ b/filecloudapi/fcserver.py @@ -802,7 +802,9 @@ def close(self): "date": self._serverdatetime(datemodified), "adminproxyuserid": adminproxyuserid, "nofileoverwrite": nofileoverwrite, - "iflastmodified": self._serverdatetime(iflastmodified) if iflastmodified else None, + "iflastmodified": ( + self._serverdatetime(iflastmodified) if iflastmodified else None + ), } params_str = urlencode(params) @@ -845,7 +847,9 @@ def close(self): "date": self._serverdatetime(datemodified), "adminproxyuserid": adminproxyuserid, "nofileoverwrite": nofileoverwrite, - "iflastmodified": self._serverdatetime(iflastmodified) if iflastmodified else None, + "iflastmodified": ( + self._serverdatetime(iflastmodified) if iflastmodified else None + ), } if data_size is not None: