simon987/ws_bucket_client
1
0
Fork 0
mirror of https://github.com/simon987/ws_bucket_client.git synced 2025-04-16 00:36:48 +00:00
Code Issues Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
simon987 2019-03-16 11:24:10 -04:00
parent 52a95659e9
commit 03a21d28a8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api.py
View File

@ -14,9 +14,10 @@ API_TIMEOUT = 10
class WsBucketApi: class WsBucketApi:
def __init__(self, url: str, secret: str): def __init__(self, url: str, secret: str, ws_scheme: str = "ws"):
self._url = urlparse(url) self._url = urlparse(url)
self._secret = secret.encode("utf8") self._secret = secret.encode("utf8")
self._ws_scheme = ws_scheme
def allocate(self, token: str, max_size: int, file_name: str): def allocate(self, token: str, max_size: int, file_name: str):
return self._http_post("/slot", { return self._http_post("/slot", {
@ -30,7 +31,7 @@ class WsBucketApi:
def upload(self, token: str, stream: BinaryIO, max_size: int): def upload(self, token: str, stream: BinaryIO, max_size: int):
ws = websocket.WebSocket() ws = websocket.WebSocket()
ws.connect("ws://" + self._url + "/upload", header={ ws.connect(self._ws_scheme + "://" + self._url + "/upload", header={
"X-Upload-Token": token, "X-Upload-Token": token,
}) })
@ -51,7 +52,7 @@ class WsBucketApi:
retries = 0 retries = 0
while retries < MAX_HTTP_RETRIES: while retries < MAX_HTTP_RETRIES:
try: try:
response = requests.post(self._url.scheme + self._url.host + endpoint, timeout=API_TIMEOUT, response = requests.post(self._url.scheme + "://" + self._url.netloc + endpoint, timeout=API_TIMEOUT,
headers=headers, data=body.encode("utf8")) headers=headers, data=body.encode("utf8"))
return response return response
except Exception as e: except Exception as e:
@ -68,7 +69,7 @@ class WsBucketApi:
retries = 0 retries = 0
while retries < MAX_HTTP_RETRIES: while retries < MAX_HTTP_RETRIES:
try: try:
response = requests.get("http://" + self._url + endpoint, timeout=API_TIMEOUT, response = requests.get(self._url.scheme + "://" + self._url.netloc + endpoint, timeout=API_TIMEOUT,
headers=headers) headers=headers)
return response return response
except Exception as e: except Exception as e: