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

warn and ignore unsupported files

Browse source
This commit is contained in:
j 2013-04-30 17:39:31 +02:00
parent 68426aaa6a
commit abae6e40ca
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pandora_client/__init__.py
View file

@ -311,7 +311,10 @@ class Client(object):
break
if update:
info = utils.avinfo(path)
if info['size'] > 0:
if 'error' in info or info['size'] == 0:
print info
return False
else:
oshash = info['oshash']
sha1 = None
deleted = -1
@ -320,8 +323,7 @@ class Client(object):
c.execute(u'INSERT OR REPLACE INTO file values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
t)
conn.commit()
else:
print info
return True
def cmd(self, args):
filename = args[0]
@ -415,6 +417,7 @@ class Client(object):
files = []
unknown = []
ignored = []
unsupported = []
for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
if isinstance(dirpath, str):
dirpath = dirpath.decode('utf-8')
@ -432,8 +435,10 @@ class Client(object):
unknown.append(f)
files = list(set(files) - set(unknown))
for f in files:
self.scan_file(f)
if not self.scan_file(f):
unsupported.append(f)
if unknown:
example = example_path(self)
@ -443,6 +448,13 @@ class Client(object):
print '\n\t'.join([f[len(path):] for f in unknown])
print ''
if unsupported:
files = list(set(files) - set(unsupported))
print 'The following files are in an unsupported format and will not be synced:'
print '\t',
print '\n\t'.join([f[len(path):] for f in unsupported])
print ''
deleted_files = filter(lambda f: f not in files, known_files)
new_files = filter(lambda f: f not in known_files, files)
conn, c = self._conn()
@ -452,8 +464,8 @@ class Client(object):
c.execute('UPDATE file SET deleted=? WHERE path=?', (deleted, f))
conn.commit()
print "scanned volume %s: %s files, %s new, %s deleted, %s ignored" % (
name, len(files), len(new_files), len(deleted_files), len(ignored))
print "scanned volume %s: %s files, %s new, %s deleted, %s ignored, %s unsupported" % (
name, len(files), len(new_files), len(deleted_files), len(ignored), len(unsupported))
def extract(self, args):