Compare commits

..

No commits in common. "7e72cfd163d9fc868f79f0ae928fc8f926106926" and "2ebc6ffd3a5153d4308763e1547fd3153f59f98b" have entirely different histories.

2 changed files with 7 additions and 14 deletions

View file

@ -151,8 +151,7 @@ class API(object):
fd.write(chunk)
shutil.move(tmpname, filename)
def upload_chunks(self, url, filename, data=None, silent=False):
def upload_chunks(self, url, filename, data=None):
form = MultiPartForm()
if data:
for key in data:
@ -189,22 +188,18 @@ class API(object):
try:
data = self._json_request(uploadUrl, form)
except KeyboardInterrupt:
if not slient:
print("\ninterrupted by user.")
sys.exit(1)
except:
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:
if not slient:
print("login required")
return False
if data['status']['code'] != 200:
if not slient:
print("request returned error, will try again in 5 seconds")
if self.DEBUG:
print(data)
@ -212,7 +207,6 @@ class API(object):
if data and data.get('result') == 1:
done += len(chunk)
if data.get('offset') not in (None, done):
if not slient:
print('server offset out of sync, continue from', data['offset'])
done = data['offset']
f.seek(done)

View file

@ -32,8 +32,7 @@ EXTENSIONS = {
'avi', 'divx', 'dv', 'flv', 'm2t', 'm2ts', 'm4v', 'mkv', 'mov', 'mp4',
'mpeg', 'mpg', 'mts', 'ogm', 'ogv', 'rm', 'rmvb', 'vob', 'webm', 'wmv', 'asf',
'mod', 'tod', # http://en.wikipedia.org/wiki/MOD_and_TOD
'mxf', 'ts',
'dat', # VOD files
'mxf', 'ts'
],
}