niu/mdrs-client-python
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimize class dependencies.

Browse Source
This commit is contained in:
Yoshihiro OKUMURA
2023-05-10 14:46:08 +09:00
parent 0281dd2ccb
commit dd0b0ba68f
12 changed files with 136 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mdrsclient/api/file.py
View File

@ -21,7 +21,7 @@ class FileApi(BaseApi):
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + id + "/"
token_check(self.connection)
response = self._get(url)
response = self.connection.get(url)
self._raise_response_error(response)
return parse_obj_as(File, response.json())
@ -32,7 +32,7 @@ class FileApi(BaseApi):
data = {"folder_id": folder_id}
try:
with open(path, mode="rb") as fp:
response = self._post(url, data=data, files={"file": fp})
response = self.connection.post(url, data=data, files={"file": fp})
self._raise_response_error(response)
ret = parse_obj_as(FileCreateResponse, response.json())
except OSError:
@ -47,13 +47,13 @@ class FileApi(BaseApi):
# update file body
try:
with open(path, mode="rb") as fp:
response = self._put(url, files={"file": fp})
response = self.connection.put(url, files={"file": fp})
except OSError:
raise UnexpectedException(f"Could not open `{path}` file.")
else:
# update metadata
data = {"name": file.name, "description": file.description}
response = self._put(url, data=data)
response = self.connection.put(url, data=data)
self._raise_response_error(response)
return True
@ -61,7 +61,7 @@ class FileApi(BaseApi):
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + file.id + "/"
token_check(self.connection)
response = self._delete(url)
response = self.connection.delete(url)
self._raise_response_error(response)
return True
@ -70,7 +70,7 @@ class FileApi(BaseApi):
url = self.ENTRYPOINT + file.id + "/move/"
data = {"folder": folder_id}
token_check(self.connection)
response = self._post(url, data=data)
response = self.connection.post(url, data=data)
self._raise_response_error(response)
return True
@ -78,14 +78,14 @@ class FileApi(BaseApi):
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + file.id + "/metadata/"
token_check(self.connection)
response = self._get(url)
response = self.connection.get(url)
self._raise_response_error(response)
return response.json()
def download(self, file: File, path: str) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = "v2/" + file.download_url
response = self._get(url, stream=True)
response = self.connection.get(url, stream=True)
self._raise_response_error(response)
try:
with open(path, "wb") as f: