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

specify oshash to upload

Browse source
This commit is contained in:
j 2012-01-19 16:55:07 +05:30
parent 533c2e2f7f
commit c328b3252c
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pandora_client/__init__.py
View file

@ -368,21 +368,27 @@ class Client(object):
return return
conn, c = self._conn() conn, c = self._conn()
if args:
data = args
files = []
else:
#send empty list to get updated list of requested info/files/data #send empty list to get updated list of requested info/files/data
post = {'info': {}} post = {'info': {}}
r = self.api.update(post) r = self.api.update(post)
files = r['data']['file']
datas = r['data']['data']
if r['data']['file']: if files:
print 'uploading %s files' % len(r['data']['file']) print 'uploading %s files' % len(files)
for oshash in r['data']['file']: for oshash in files:
for path in self.path(oshash): for path in self.path(oshash):
if os.path.exists(path): if os.path.exists(path):
self.api.uploadData(path, oshash) self.api.uploadData(path, oshash)
break break
if r['data']['data']: if data:
print 'encoding and uploading %s videos' % len(r['data']['data']) print 'encoding and uploading %s videos' % len(data)
for oshash in r['data']['data']: for oshash in data:
data = {} data = {}
for path in self.path(oshash): for path in self.path(oshash):
if os.path.exists(path): if os.path.exists(path):
@ -500,12 +506,12 @@ class API(ox.API):
fname = fname.encode('utf-8') fname = fname.encode('utf-8')
while chunk: while chunk:
elapsed = time.mktime(time.localtime()) - start elapsed = time.mktime(time.localtime()) - start
if done:
remaining = int((elapsed / (done/fsize) - elapsed)/60) * 60 * 1000
remaining = ", %s remaining" % ox.formatDuration(remaining,
milliseconds=False, verbosity=2)
else:
remaining = "" remaining = ""
if done:
r = int((elapsed / (done/fsize) - elapsed)/60) * 60 * 1000
r = ox.formatDuration(r, milliseconds=False, verbosity=2)
if r:
remaining = ", %s remaining" % r
msg = '%0.2f%% %s of %s done%s' % ( msg = '%0.2f%% %s of %s done%s' % (
100 * done/fsize, ox.formatBytes(done), ox.formatBytes(fsize), remaining) 100 * done/fsize, ox.formatBytes(done), ox.formatBytes(fsize), remaining)
print ''.join([msg, ' ' * (80-len(msg)), '\r']), print ''.join([msg, ' ' * (80-len(msg)), '\r']),