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

Removed import of unicode_literals from plugins

Browse source 
* play
* plexpudate
* random
* replaygain
This commit is contained in:
Peter Kessen 2016-02-20 14:22:45 +01:00
parent feab3df910
commit 456565b6f2
4 changed files with 58 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
beetsplug/play.py
View file

@ -15,8 +15,7 @@
"""Send the results of a query to the configured music player as a playlist.
"""
from __future__ import (division, absolute_import, print_function,
unicode_literals)
from __future__ import (division, absolute_import, print_function)
from beets.plugins import BeetsPlugin
from beets.ui import Subcommand
@ -49,13 +48,13 @@ class PlayPlugin(BeetsPlugin):
def commands(self):
play_command = Subcommand(
'play',
help='send music to a player as a playlist'
help=u'send music to a player as a playlist'
)
play_command.parser.add_album_option()
play_command.parser.add_option(
'-A', '--args',
u'-A', u'--args',
action='store',
help='add additional arguments to the command',
help=u'add additional arguments to the command',
)
play_command.func = self.play_music
return [play_command]
@ -90,7 +89,7 @@ class PlayPlugin(BeetsPlugin):
if ARGS_MARKER in command_str:
command_str = command_str.replace(ARGS_MARKER, opts.args)
else:
command_str = "{} {}".format(command_str, opts.args)
command_str = u"{} {}".format(command_str, opts.args)
# Perform search by album and add folders rather than tracks to
# playlist.
@ -119,16 +118,15 @@ class PlayPlugin(BeetsPlugin):
if not selection:
ui.print_(ui.colorize('text_warning',
'No {0} to play.'.format(item_type)))
u'No {0} to play.'.format(item_type)))
return
# Warn user before playing any huge playlists.
if warning_threshold and len(selection) > warning_threshold:
ui.print_(ui.colorize(
'text_warning',
'You are about to queue {0} {1}.'.format(len(selection),
item_type)
))
u'You are about to queue {0} {1}.'.format(
len(selection), item_type)))
if ui.input_options(('Continue', 'Abort')) == 'a':
return
@ -139,13 +137,13 @@ class PlayPlugin(BeetsPlugin):
else:
open_args = [self._create_tmp_playlist(paths)]
self._log.debug('executing command: {} {}', command_str,
self._log.debug(u'executing command: {} {}', command_str,
b' '.join(open_args))
try:
util.interactive_open(open_args, command_str)
except OSError as exc:
raise ui.UserError("Could not play the query: "
"{0}".format(exc))
raise ui.UserError(
"Could not play the query: {0}".format(exc))
def _create_tmp_playlist(self, paths_list):
"""Create a temporary .m3u file. Return the filename.

9
beetsplug/plexupdate.py
View file

@ -9,8 +9,7 @@ Put something like the following in your config.yaml to configure:
port: 32400
token: token
"""
from __future__ import (division, absolute_import, print_function,
unicode_literals)
from __future__ import (division, absolute_import, print_function)
import requests
from urlparse import urljoin
@ -78,7 +77,7 @@ class PlexUpdate(BeetsPlugin):
def update(self, lib):
"""When the client exists try to send refresh request to Plex server.
"""
self._log.info('Updating Plex library...')
self._log.info(u'Updating Plex library...')
# Try to send update request.
try:
@ -87,7 +86,7 @@ class PlexUpdate(BeetsPlugin):
config['plex']['port'].get(),
config['plex']['token'].get(),
config['plex']['library_name'].get())
self._log.info('... started.')
self._log.info(u'... started.')
except requests.exceptions.RequestException:
self._log.warning('Update failed.')
self._log.warning(u'Update failed.')

15
beetsplug/random.py
View file

@ -15,8 +15,7 @@
"""Get a random song or album from the library.
"""
from __future__ import (division, absolute_import, print_function,
unicode_literals)
from __future__ import (division, absolute_import, print_function)
from beets.plugins import BeetsPlugin
from beets.ui import Subcommand, decargs, print_
@ -66,11 +65,13 @@ def random_item(lib, opts, args):
print_(format(item))
random_cmd = Subcommand('random',
help='chose a random track or album')
random_cmd.parser.add_option('-n', '--number', action='store', type="int",
help='number of objects to choose', default=1)
random_cmd.parser.add_option('-e', '--equal-chance', action='store_true',
help='each artist has the same chance')
help=u'chose a random track or album')
random_cmd.parser.add_option(
u'-n', u'--number', action='store', type="int",
help=u'number of objects to choose', default=1)
random_cmd.parser.add_option(
u'-e', u'--equal-chance', action='store_true',
help=u'each artist has the same chance')
random_cmd.parser.add_all_common_options()
random_cmd.func = random_item

84
beetsplug/replaygain.py
View file

@ -13,8 +13,7 @@
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
from __future__ import (division, absolute_import, print_function,
unicode_literals)
from __future__ import (division, absolute_import, print_function)
import subprocess
import os
@ -56,13 +55,13 @@ def call(args):
return command_output(args)
except subprocess.CalledProcessError as e:
raise ReplayGainError(
"{0} exited with status {1}".format(args[0], e.returncode)
u"{0} exited with status {1}".format(args[0], e.returncode)
)
except UnicodeEncodeError:
# Due to a bug in Python 2's subprocess on Windows, Unicode
# filenames can fail to encode on that platform. See:
# http://code.google.com/p/beets/issues/detail?id=499
raise ReplayGainError("argument encoding failed")
raise ReplayGainError(u"argument encoding failed")
# Backend base and plumbing classes.
@ -111,11 +110,11 @@ class Bs1770gainBackend(Backend):
self.command = cmd
except OSError:
raise FatalReplayGainError(
'Is bs1770gain installed? Is your method in config correct?'
u'Is bs1770gain installed? Is your method in config correct?'
)
if not self.command:
raise FatalReplayGainError(
'no replaygain command found: install bs1770gain'
u'no replaygain command found: install bs1770gain'
)
def compute_track_gain(self, items):
@ -137,7 +136,7 @@ class Bs1770gainBackend(Backend):
output = self.compute_gain(supported_items, True)
if not output:
raise ReplayGainError('no output from bs1770gain')
raise ReplayGainError(u'no output from bs1770gain')
return AlbumGain(output[-1], output[:-1])
def isplitter(self, items, chunk_at):
@ -204,7 +203,8 @@ class Bs1770gainBackend(Backend):
args = cmd + [syspath(i.path, prefix=False) for i in items]
# Invoke the command.
self._log.debug("executing {0}", " ".join(map(displayable_path, args)))
self._log.debug(
u'executing {0}', u' '.join(map(displayable_path, args)))
output = call(args)
self._log.debug(u'analysis finished: {0}', output)
@ -228,8 +228,8 @@ class Bs1770gainBackend(Backend):
for parts in results[0:num_lines]:
part = parts.split(b'\n')
if len(part) == 0:
self._log.debug('bad tool output: {0!r}', text)
raise ReplayGainError('bs1770gain failed')
self._log.debug(u'bad tool output: {0!r}', text)
raise ReplayGainError(u'bs1770gain failed')
try:
song = {
@ -238,7 +238,7 @@ class Bs1770gainBackend(Backend):
'peak': float(part[2].split('/')[1]),
}
except IndexError:
self._log.info('bs1770gain reports (faulty file?): {}', parts)
self._log.info(u'bs1770gain reports (faulty file?): {}', parts)
continue
out.append(Gain(song['gain'], song['peak']))
@ -261,9 +261,8 @@ class CommandBackend(Backend):
# Explicit executable path.
if not os.path.isfile(self.command):
raise FatalReplayGainError(
'replaygain command does not exist: {0}'.format(
self.command
)
u'replaygain command does not exist: {0}'.format(
self.command)
)
else:
# Check whether the program is in $PATH.
@ -275,8 +274,7 @@ class CommandBackend(Backend):
pass
if not self.command:
raise FatalReplayGainError(
'no replaygain command found: install mp3gain or aacgain'
)
u'no replaygain command found: install mp3gain or aacgain')
self.noclip = config['noclip'].get(bool)
target_level = config['targetlevel'].as_number()
@ -322,7 +320,7 @@ class CommandBackend(Backend):
the album gain
"""
if len(items) == 0:
self._log.debug('no supported tracks to analyze')
self._log.debug(u'no supported tracks to analyze')
return []
"""Compute ReplayGain values and return a list of results
@ -361,7 +359,7 @@ class CommandBackend(Backend):
parts = line.split(b'\t')
if len(parts) != 6 or parts[0] == b'File':
self._log.debug(u'bad tool output: {0}', text)
raise ReplayGainError('mp3gain failed')
raise ReplayGainError(u'mp3gain failed')
d = {
'file': parts[0],
'mp3gain': int(parts[1]),
@ -397,8 +395,7 @@ class GStreamerBackend(Backend):
if self._src is None or self._decbin is None or self._conv is None \
or self._res is None or self._rg is None:
raise FatalGstreamerPluginReplayGainError(
"Failed to load required GStreamer plugins"
)
u"Failed to load required GStreamer plugins")
# We check which files need gain ourselves, so all files given
# to rganalsys should have their gain computed, even if it
@ -444,15 +441,13 @@ class GStreamerBackend(Backend):
import gi
except ImportError:
raise FatalReplayGainError(
"Failed to load GStreamer: python-gi not found"
)
u"Failed to load GStreamer: python-gi not found")
try:
gi.require_version('Gst', '1.0')
except ValueError as e:
raise FatalReplayGainError(
"Failed to load GStreamer 1.0: {0}".format(e)
)
u"Failed to load GStreamer 1.0: {0}".format(e))
from gi.repository import GObject, Gst, GLib
# Calling GObject.threads_init() is not needed for
@ -486,7 +481,7 @@ class GStreamerBackend(Backend):
def compute_track_gain(self, items):
self.compute(items, False)
if len(self._file_tags) != len(items):
raise ReplayGainError("Some tracks did not receive tags")
raise ReplayGainError(u"Some tracks did not receive tags")
ret = []
for item in items:
@ -499,7 +494,7 @@ class GStreamerBackend(Backend):
items = list(album.items())
self.compute(items, True)
if len(self._file_tags) != len(items):
raise ReplayGainError("Some items in album did not receive tags")
raise ReplayGainError(u"Some items in album did not receive tags")
# Collect track gains.
track_gains = []
@ -508,7 +503,7 @@ class GStreamerBackend(Backend):
gain = self._file_tags[item]["TRACK_GAIN"]
peak = self._file_tags[item]["TRACK_PEAK"]
except KeyError:
raise ReplayGainError("results missing for track")
raise ReplayGainError(u"results missing for track")
track_gains.append(Gain(gain, peak))
# Get album gain information from the last track.
@ -517,7 +512,7 @@ class GStreamerBackend(Backend):
gain = last_tags["ALBUM_GAIN"]
peak = last_tags["ALBUM_PEAK"]
except KeyError:
raise ReplayGainError("results missing for album")
raise ReplayGainError(u"results missing for album")
return AlbumGain(Gain(gain, peak), track_gains)
@ -539,8 +534,7 @@ class GStreamerBackend(Backend):
f = self._src.get_property("location")
# A GStreamer error, either an unsupported format or a bug.
self._error = ReplayGainError(
"Error {0!r} - {1!r} on file {2!r}".format(err, debug, f)
)
u"Error {0!r} - {1!r} on file {2!r}".format(err, debug, f))
def _on_tag(self, bus, message):
tags = message.parse_tag()
@ -663,8 +657,7 @@ class AudioToolsBackend(Backend):
import audiotools.replaygain
except ImportError:
raise FatalReplayGainError(
"Failed to load audiotools: audiotools not found"
)
u"Failed to load audiotools: audiotools not found")
self._mod_audiotools = audiotools
self._mod_replaygain = audiotools.replaygain
@ -681,12 +674,10 @@ class AudioToolsBackend(Backend):
audiofile = self._mod_audiotools.open(item.path)
except IOError:
raise ReplayGainError(
"File {} was not found".format(item.path)
)
u"File {} was not found".format(item.path))
except self._mod_audiotools.UnsupportedFile:
raise ReplayGainError(
"Unsupported file type {}".format(item.format)
)
u"Unsupported file type {}".format(item.format))
return audiofile
@ -704,8 +695,7 @@ class AudioToolsBackend(Backend):
rg = self._mod_replaygain.ReplayGain(audiofile.sample_rate())
except ValueError:
raise ReplayGainError(
"Unsupported sample rate {}".format(item.samplerate)
)
u"Unsupported sample rate {}".format(item.samplerate))
return
return rg
@ -730,8 +720,8 @@ class AudioToolsBackend(Backend):
except ValueError as exc:
# `audiotools.replaygain` can raise a `ValueError` if the sample
# rate is incorrect.
self._log.debug('error in rg.title_gain() call: {}', exc)
raise ReplayGainError('audiotools audio data error')
self._log.debug(u'error in rg.title_gain() call: {}', exc)
raise ReplayGainError(u'audiotools audio data error')
def _compute_track_gain(self, item):
"""Compute ReplayGain value for the requested item.
@ -830,8 +820,7 @@ class ReplayGainPlugin(BeetsPlugin):
)
except (ReplayGainError, FatalReplayGainError) as e:
raise ui.UserError(
'replaygain initialization failed: {0}'.format(e)
)
u'replaygain initialization failed: {0}'.format(e))
def track_requires_gain(self, item):
return self.overwrite or \
@ -894,8 +883,7 @@ class ReplayGainPlugin(BeetsPlugin):
self._log.info(u"ReplayGain error: {0}", e)
except FatalReplayGainError as e:
raise ui.UserError(
u"Fatal replay gain error: {0}".format(e)
)
u"Fatal replay gain error: {0}".format(e))
def handle_track(self, item, write):
"""Compute track replay gain and store it in the item.
@ -914,8 +902,7 @@ class ReplayGainPlugin(BeetsPlugin):
track_gains = self.backend_instance.compute_track_gain([item])
if len(track_gains) != 1:
raise ReplayGainError(
u"ReplayGain backend failed for track {0}".format(item)
)
u"ReplayGain backend failed for track {0}".format(item))
self.store_track_gain(item, track_gains[0])
if write:
@ -924,8 +911,7 @@ class ReplayGainPlugin(BeetsPlugin):
self._log.info(u"ReplayGain error: {0}", e)
except FatalReplayGainError as e:
raise ui.UserError(
u"Fatal replay gain error: {0}".format(e)
)
u"Fatal replay gain error: {0}".format(e))
def imported(self, session, task):
"""Add replay gain info to items or albums of ``task``.
@ -951,7 +937,7 @@ class ReplayGainPlugin(BeetsPlugin):
for item in lib.items(ui.decargs(args)):
self.handle_track(item, write)
cmd = ui.Subcommand('replaygain', help='analyze for ReplayGain')
cmd = ui.Subcommand('replaygain', help=u'analyze for ReplayGain')
cmd.parser.add_album_option()
cmd.func = func
return [cmd]