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

python 2.7 fixes

Browse source
This commit is contained in:
j 2011-08-10 14:24:01 +02:00
parent 514d11b4b7
commit 936ed5b74f
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pandora_client/__init__.py
View file

@ -237,8 +237,7 @@ class Client(object):
post = {} post = {}
post['files'] = files['files'] post['files'] = files['files']
post['volume'] = name post['volume'] = name
print 'sending list of files' print 'sending list of files', len(post['files'])
print len(json.dumps(post))
r = self.api.update(post) r = self.api.update(post)
if r['status']['code'] == 200: if r['status']['code'] == 200:
#backend works on update request asyncronously, wait for it to finish #backend works on update request asyncronously, wait for it to finish
@ -261,8 +260,9 @@ class Client(object):
for oshash in info[offset:offset+max_info]: for oshash in info[offset:offset+max_info]:
if oshash in files['info']: if oshash in files['info']:
post['info'][oshash] = files['info'][oshash] post['info'][oshash] = files['info'][oshash]
print 'sending info for new files', len(post['info']), offset, total if len(post['info']):
r = self.api.update(post) print 'sending info for new files', len(post['info']), offset, total
r = self.api.update(post)
#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': {}}
@ -293,7 +293,8 @@ class Client(object):
return return
else: else:
print oshash, "missing" pass
#print oshash, "missing"
else: else:
print "updating volume", name, "failed" print "updating volume", name, "failed"
print r print r
@ -334,8 +335,12 @@ class API(object):
self._cj = cj self._cj = cj
else: else:
self._cj = cookielib.CookieJar() self._cj = cookielib.CookieJar()
self._opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cj)) self._opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self._cj),
urllib2.install_opener(self._opener) urllib2.HTTPHandler(debuglevel=0))
self._opener.addheaders = [
('User-Agent', 'pandora_client/%s' % __version__)
]
self.media_cache = media_cache self.media_cache = media_cache
if not self.media_cache: if not self.media_cache:
@ -368,13 +373,14 @@ class API(object):
def _json_request(self, url, form): def _json_request(self, url, form):
result = {} result = {}
try: try:
request = urllib2.Request(url) request = urllib2.Request(str(url))
request.add_header('User-agent', 'pandora_client/%s' % __version__)
body = str(form) body = str(form)
request.add_header('Content-type', form.get_content_type()) request.add_header('Content-type', form.get_content_type())
request.add_header('Content-length', len(body)) request.add_header('Content-length', len(body))
print 'content-length', len(body), type(body)
print 'Content-type', form.get_content_type()
request.add_data(body) request.add_data(body)
result = urllib2.urlopen(request).read().strip() result = self._opener.open(request).read().strip()
return json.loads(result) return json.loads(result)
except urllib2.HTTPError, e: except urllib2.HTTPError, e:
if DEBUG: if DEBUG:
@ -419,18 +425,19 @@ class API(object):
#upload frames #upload frames
form = ox.MultiPartForm() form = ox.MultiPartForm()
form.add_field('action', 'upload') form.add_field('action', 'upload')
form.add_field('id', str(i['oshash'])) form.add_field('id', i['oshash'])
for key in data: for key in data:
form.add_field(str(key), data[key].encode('utf-8')) form.add_field(key, data[key])
for frame in i['frames']: for frame in i['frames']:
fname = os.path.basename(frame) fname = os.path.basename(frame)
if isinstance(fname, unicode): fname = fname.encode('utf-8')
if os.path.exists(frame): if os.path.exists(frame):
form.add_file('frame', fname, open(frame, 'rb')) form.add_file('frame', fname, open(frame, 'rb'))
print self.url
r = self._json_request(self.url, form) r = self._json_request(self.url, form)
if os.path.exists(i['video']): if os.path.exists(i['video']):
#upload video in chunks
url = self.url + 'upload/' + '?profile=' + str(profile) + '&id=' + i['oshash'] url = self.url + 'upload/' + '?profile=' + str(profile) + '&id=' + i['oshash']
if DEBUG:
print "upload video in chunks", url
ogg = Firefogg(cj=self._cj, debug=True) ogg = Firefogg(cj=self._cj, debug=True)
if not ogg.upload(url, i['video'], data): if not ogg.upload(url, i['video'], data):
if DEBUG: if DEBUG: