0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remaining

Browse source
This commit is contained in:
j 2011-12-31 20:10:11 +05:30
parent f9970fdcea
commit 5f46806e1b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pandora_client/__init__.py
View file

@ -432,13 +432,17 @@ class API(ox.API):
f = open(filename)
fsize = os.stat(filename).st_size
done = 0
start = time.mktime(time.localtime())
chunk = f.read(CHUNK_SIZE)
fname = os.path.basename(filename)
if isinstance(fname, unicode):
fname = fname.encode('utf-8')
while chunk:
print '%0.2f%% %s of %s uploaded \r' % (
100 * done/fsize, ox.formatBytes(done), ox.formatBytes(fsize)),
elapsed = time.mktime(time.localtime()) - start
remaining = elapsed / (done/fsize) - elapsed
print '%0.2f%% %s of %s done, %s remaining\r' % (
100 * done/fsize, ox.formatBytes(done), ox.formatBytes(fsize),
ox.formatDuration(remaining, verbosity=2)),
sys.stdout.flush()
form = ox.MultiPartForm()
form.add_file('chunk', fname, chunk)
@ -466,11 +470,11 @@ class API(ox.API):
if DEBUG:
print data
time.sleep(5)
if data and data['result'] == 1:
if data and data.get('result') == 1:
done += len(chunk)
chunk = f.read(CHUNK_SIZE)
print ' '
return data and 'result' in data and data['result'] == 1
return data and 'result' in data and data.get('result') == 1
else:
if DEBUG:
if 'status' in data and data['status']['code'] == 401: