diff --git a/mopidy/backends/base.py b/mopidy/backends/base.py index 3c1bbbf0..6b980f06 100644 --- a/mopidy/backends/base.py +++ b/mopidy/backends/base.py @@ -155,10 +155,9 @@ class BasePlaybackProvider(object): :type track: :class:`mopidy.models.Track` :rtype: :class:`True` if successful, else :class:`False` """ - self.audio.prepare_change() # TODO: add .get() to this? + self.audio.prepare_change() self.change_track(track) - self.audio.start_playback().get() - return True + return self.audio.start_playback().get() def change_track(self, track): """ diff --git a/mopidy/backends/local/playback.py b/mopidy/backends/local/playback.py index 8c40cb9e..eda06ff7 100644 --- a/mopidy/backends/local/playback.py +++ b/mopidy/backends/local/playback.py @@ -6,7 +6,7 @@ import os from mopidy.backends import base from mopidy.utils import path -logger = logging.getLogger('mopidy.backends.spotify') +logger = logging.getLogger('mopidy.backends.local') class LocalPlaybackProvider(base.BasePlaybackProvider): diff --git a/mopidy/ext.py b/mopidy/ext.py index 4b6e4502..22daa3cb 100644 --- a/mopidy/ext.py +++ b/mopidy/ext.py @@ -80,6 +80,11 @@ class Extension(object): return [] def get_library_updaters(self): + """List of library updater classes + + :returns: list of :class:`~mopidy.backends.base.BaseLibraryUpdateProvider` + subclasses + """ return [] def register_gstreamer_elements(self): diff --git a/mopidy/scanner.py b/mopidy/scanner.py index 1752ece9..f87407f8 100644 --- a/mopidy/scanner.py +++ b/mopidy/scanner.py @@ -62,11 +62,11 @@ def main(): updaters[e.ext_name] = updater_class if not updaters: - logging.error('No usable updaters found.') + logging.error('No usable library updaters found.') return elif len(updaters) > 1: - names = ', '.join(updaters.keys()) - logging.error('More than one updater found. Provided by: %s', names) + logging.error('More than one library updater found. ' + 'Provided by: %s', ', '.join(updaters.keys())) return local_updater = updaters.values()[0](config) # TODO: switch to actor? diff --git a/tests/backends/local/__init__.py b/tests/backends/local/__init__.py index ca93cdc0..1738722f 100644 --- a/tests/backends/local/__init__.py +++ b/tests/backends/local/__init__.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals -from mopidy.utils.path import path_to_uri - generate_song = lambda i: 'local:track:song%s.wav' % i diff --git a/tests/backends/local/playback_test.py b/tests/backends/local/playback_test.py index b12464bd..530f09c8 100644 --- a/tests/backends/local/playback_test.py +++ b/tests/backends/local/playback_test.py @@ -6,9 +6,9 @@ from mopidy.backends.local import actor from mopidy.core import PlaybackState from mopidy.models import Track +from tests import path_to_data_dir from tests.backends.base.playback import PlaybackControllerTest from tests.backends.local import generate_song -from tests import path_to_data_dir class LocalPlaybackControllerTest(PlaybackControllerTest, unittest.TestCase):