Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-07 17:16:07 +01:00
Code Issues Projects Releases Wiki Activity

Implement comments

Browse source
This commit is contained in:
ybnd 2020-01-30 19:48:31 +01:00
parent 65ffca215a
commit f51a68c7e1
1 changed files with 35 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
beetsplug/replaygain.py
View file

@ -1339,18 +1339,13 @@ class ReplayGainPlugin(BeetsPlugin):
u"ReplayGain backend failed " u"ReplayGain backend failed "
u"for some tracks in album {0}".format(album) u"for some tracks in album {0}".format(album)
) )
try: for item, track_gain in zip(items,
for item, track_gain in zip(items, album_gain.track_gains):
album_gain.track_gains): store_track_gain(item, track_gain)
store_track_gain(item, track_gain) store_album_gain(item, album_gain.album_gain)
store_album_gain(item, album_gain.album_gain) if write:
if write: item.try_write()
item.try_write() self._log.debug(u'done analyzing {0}', item)
self._log.debug(u'done analyzing {0}', item)
except ReplayGainError as e:
self._log.info(u"ReplayGain error: {0}", e)
except FatalReplayGainError as e:
raise ui.UserError(u"Fatal ReplayGain error: {0}".format(e))
try: try:
self._apply( self._apply(
@ -1383,21 +1378,16 @@ class ReplayGainPlugin(BeetsPlugin):
store_track_gain, store_album_gain, target_level, peak = tag_vals store_track_gain, store_album_gain, target_level, peak = tag_vals
def _store_track(track_gains): def _store_track(track_gains):
try: if len(track_gains) != 1:
if len(track_gains) != 1: raise ReplayGainError(
raise ReplayGainError( u"ReplayGain backend failed for track {0}".format(
u"ReplayGain backend failed for track {0}".format( item)
item) )
)
store_track_gain(item, track_gains[0]) store_track_gain(item, track_gains[0])
if write: if write:
item.try_write() item.try_write()
self._log.debug(u'done analyzing {0}', item) self._log.debug(u'done analyzing {0}', item)
except ReplayGainError as e:
self._log.info(u"ReplayGain error: {0}", e)
except FatalReplayGainError as e:
raise ui.UserError(u"Fatal ReplayGain error: {0}".format(e))
try: try:
self._apply( self._apply(
@ -1409,7 +1399,6 @@ class ReplayGainPlugin(BeetsPlugin):
}, },
callback=_store_track callback=_store_track
) )
except ReplayGainError as e: except ReplayGainError as e:
self._log.info(u"ReplayGain error: {0}", e) self._log.info(u"ReplayGain error: {0}", e)
except FatalReplayGainError as e: except FatalReplayGainError as e:
@ -1463,6 +1452,24 @@ class ReplayGainPlugin(BeetsPlugin):
def commands(self): def commands(self):
"""Return the "replaygain" ui subcommand. """Return the "replaygain" ui subcommand.
""" """
def func(lib, opts, args):
write = ui.should_write(opts.write)
force = opts.force
# Bypass self.open_pool() if called with `--threads 0`
if opts.threads != 0:
threads = opts.threads or self.config['threads'].get(int)
self.open_pool(threads)
if opts.album:
for album in lib.albums(ui.decargs(args)):
self.handle_album(album, write, force)
else:
for item in lib.items(ui.decargs(args)):
self.handle_track(item, write, force)
self.close_pool()
cmd = ui.Subcommand('replaygain', help=u'analyze for ReplayGain') cmd = ui.Subcommand('replaygain', help=u'analyze for ReplayGain')
cmd.parser.add_album_option() cmd.parser.add_album_option()
cmd.parser.add_option( cmd.parser.add_option(
@ -1480,24 +1487,5 @@ class ReplayGainPlugin(BeetsPlugin):
cmd.parser.add_option( cmd.parser.add_option(
"-W", "--nowrite", dest="write", action="store_false", "-W", "--nowrite", dest="write", action="store_false",
help=u"don't write metadata (opposite of -w)") help=u"don't write metadata (opposite of -w)")
cmd.func = self.replaygain_func cmd.func = func
return [cmd] return [cmd]
def replaygain_func(self, lib, opts, args):
"""Handle `replaygain` ui subcommand
"""
write = ui.should_write(opts.write)
force = opts.force
if opts.threads != 0:
threads = opts.threads or self.config['threads'].get(int)
self.open_pool(threads)
if opts.album:
for album in lib.albums(ui.decargs(args)):
self.handle_album(album, write, force)
else:
for item in lib.items(ui.decargs(args)):
self.handle_track(item, write, force)
self.close_pool()