diff --git a/ox/api.py b/ox/api.py index 159aec7..ec6f428 100644 --- a/ox/api.py +++ b/ox/api.py @@ -151,7 +151,7 @@ class API(object): fd.write(chunk) shutil.move(tmpname, filename) - def upload_chunks(self, url, filename, data=None): + def upload_chunks(self, url, filename, data=None, silent=False): form = MultiPartForm() if data: for key in data: @@ -188,26 +188,31 @@ class API(object): try: data = self._json_request(uploadUrl, form) except KeyboardInterrupt: - print("\ninterrupted by user.") + if not slient: + print("\ninterrupted by user.") sys.exit(1) except: - print("uploading chunk failed, will try again in 5 seconds\r", end='') + if not slient: + print("uploading chunk failed, will try again in 5 seconds\r", end='') sys.stdout.flush() data = {'result': -1} time.sleep(5) if data and 'status' in data: if data['status']['code'] == 403: - print("login required") + if not slient: + print("login required") return False if data['status']['code'] != 200: - print("request returned error, will try again in 5 seconds") + if not slient: + print("request returned error, will try again in 5 seconds") if self.DEBUG: print(data) time.sleep(5) if data and data.get('result') == 1: done += len(chunk) if data.get('offset') not in (None, done): - print('server offset out of sync, continue from', data['offset']) + if not slient: + print('server offset out of sync, continue from', data['offset']) done = data['offset'] f.seek(done) chunk = f.read(CHUNK_SIZE)