Merge branch '2.3.x' into 2.3.x-saas

This commit is contained in:
Martin Konecny 2013-03-05 16:21:47 -05:00
commit 1c80701488
10 changed files with 27 additions and 24 deletions

View file

@ -50,7 +50,7 @@ try:
full_path = f['fp']
# silence detect(set default queue in and out)
try:
command = ['silan', '-f', 'JSON', full_path]
command = ['silan', '-b' '-f', 'JSON', full_path]
proc = subprocess.Popen(command, stdout=subprocess.PIPE)
out = proc.communicate()[0].strip('\r\n')
info = json.loads(out)
@ -64,7 +64,6 @@ try:
except Exception, e:
print e
print traceback.format_exc()
break
print "Processed: %d songs" % total
subtotal += total