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

dont fail if not extracting videos, get real folderdepth, dont relogin just give up

Browse source
This commit is contained in:
j 2013-02-28 20:42:33 +01:00
parent bec480c7cf
commit 0d011e428c
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pandora_client/__init__.py
View file

@ -36,7 +36,8 @@ def encode(filename, prefix, profile, info=None, extract_frames=True):
oshash = info['oshash']
frames = []
cache = os.path.join(prefix, os.path.join(*utils.hash_prefix(oshash)))
if info['video'] and extract_frames:
if info.get('video'):
if extract_frames:
for pos in utils.video_frame_positions(info['duration']):
frame_name = '%s.png' % pos
frame_f = os.path.join(cache, frame_name)
@ -47,6 +48,10 @@ def encode(filename, prefix, profile, info=None, extract_frames=True):
video_f = os.path.join(cache, profile)
if not os.path.exists(video_f):
extract.video(filename, video_f, profile, info)
else:
print info
print filename
return None
return {
'info': info,
'oshash': oshash,
@ -181,7 +186,7 @@ class Client(object):
self.api.DEBUG = DEBUG
if self.signin():
self.profile = "%sp.webm" % max(self.api.site['video']['resolutions'])
self.folderdepth = self.api.site.get('folderdepth', 3)
self.folderdepth = self.api.site['site'].get('folderdepth', 3)
def signin(self):
if 'username' in self._config:
@ -345,7 +350,8 @@ class Client(object):
and not filename in ('.DS_Store', ) \
and not filename.endswith('~'):
file_path = os.path.join(dirpath, filename)
if os.path.exists(file_path) and os.stat(file_path).st_size>0:
if not 'Extras/' in file_path \
and os.path.exists(file_path) and os.stat(file_path).st_size>0:
files.append(file_path)
self.scan_file(file_path)
@ -536,8 +542,7 @@ class Client(object):
info = self.info(oshash)
if not self.api.uploadVideo(path,
data, self.profile, info):
if not self.signin():
print "failed to login again"
print 'video upload failed, giving up, please try again'
return
if 'rightsLevel' in self._config:
r = self.api.find({'query': {