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

fix folderdepth, video upload

Browse source
This commit is contained in:
j 2013-02-08 16:32:46 +05:30
parent 70605926ec
commit 5b3f843604
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora_client/__init__.py
View file

@ -172,13 +172,13 @@ class Client(object):
self.api.DEBUG = DEBUG self.api.DEBUG = DEBUG
if self.signin(): if self.signin():
self.profile = "%sp.webm" % max(self.api.site['video']['resolutions']) self.profile = "%sp.webm" % max(self.api.site['video']['resolutions'])
self.folderdepth = self.api.site.get('folderdepth', 3)
def signin(self): def signin(self):
if 'username' in self._config: if 'username' in self._config:
r = self.api.signin(username=self._config['username'], password=self._config['password']) r = self.api.signin(username=self._config['username'], password=self._config['password'])
if r['status']['code'] == 200 and not 'errors' in r['data']: if r['status']['code'] == 200 and not 'errors' in r['data']:
self.user = r['data']['user'] self.user = r['data']['user']
self.folderdepth = r['data']['site'].get('folderdepth', 3)
else: else:
self.user = False self.user = False
print '\nlogin failed! check config\n\n' print '\nlogin failed! check config\n\n'
@ -352,10 +352,10 @@ class Client(object):
ignored=[] ignored=[]
for f in files: for f in files:
f = f[len(path):] f = f[len(path):]
if len(f.split('/')) == self.folder_depth and not 'Versions' in f or 'Extras' in f: if len(f.split('/')) != self.folderdepth and not 'Versions' in f or 'Extras' in f:
ignored.append(f) ignored.append(f)
if ignored: if ignored:
example = self.folder_depth == 4 and 'L/Last, First/Title (Year)/Title.avi' or 'T/Title/Title.dv' example = self.folderdepth == 4 and 'L/Last, First/Title (Year)/Title.avi' or 'T/Title/Title.dv'
print 'The following files do not conform to the required folder structure and will be ignored. only files like this are synced:\n\t%s' % example print 'The following files do not conform to the required folder structure and will be ignored. only files like this are synced:\n\t%s' % example
print '\n'.join(ignored) print '\n'.join(ignored)

2
pandora_client/extract.py
View file

@ -257,8 +257,8 @@ def video_cmd(video, target, profile, info):
return cmd return cmd
def video(video, target, profile, info): def video(video, target, profile, info):
profile, format = profile.split('.')
cmd = video_cmd(video, target, profile, info) cmd = video_cmd(video, target, profile, info)
profile, format = profile.split('.')
#r = run_command(cmd, -1) #r = run_command(cmd, -1)
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE) p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
try: try: