Skip to content
Snippets Groups Projects
Commit 21144201 authored by ale's avatar ale
Browse files

fix merge conflict

parents 6c5901a2 1066fc6c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
server/djrandom/metadata_fixer/metadata_fixer.py
+ 4
− 1
View file @ 21144201
...@@ -56,6 +56,8 @@ class MetadataFixer(object): ...@@ -56,6 +56,8 @@ class MetadataFixer(object):
if e.code >= 400 and e.code < 500: if e.code >= 400 and e.code < 500:
raise NoMetadataError('HTTP Error %d' % e.code) raise NoMetadataError('HTTP Error %d' % e.code)
log.debug('retrying...')
def process(self, mp3): def process(self, mp3):
info = self.identify_song(mp3) info = self.identify_song(mp3)
mp3.title = metadata.normalize_string(info['title']) mp3.title = metadata.normalize_string(info['title'])
...@@ -74,11 +76,12 @@ class MetadataFixer(object): ...@@ -74,11 +76,12 @@ class MetadataFixer(object):
log.info('found: %s / %s' % (mp3.artist, mp3.title)) log.info('found: %s / %s' % (mp3.artist, mp3.title))
n_ok += 1 n_ok += 1
except NoMetadataError: except NoMetadataError:
mp3.state = MP3.ERROR
n_err += 1 n_err += 1
except Exception, e: except Exception, e:
log.error(traceback.format_exc()) log.error(traceback.format_exc())
n_err += 1 n_err += 1
#mp3.state = MP3.ERROR mp3.state = MP3.ERROR
Session.add(mp3) Session.add(mp3)
Session.commit() Session.commit()
self.idx.commit() self.idx.commit()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment