diff --git a/docs/api/backends/controllers.rst b/docs/api/backends/controllers.rst index d3346a27..97ce2508 100644 --- a/docs/api/backends/controllers.rst +++ b/docs/api/backends/controllers.rst @@ -50,7 +50,7 @@ Stored playlists controller Manages stored playlist. -.. autoclass:: mopidy.backends.base.BaseStoredPlaylistsController +.. autoclass:: mopidy.backends.base.StoredPlaylistsController :members: :undoc-members: diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index 529c2179..f1fdfcbe 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -11,7 +11,7 @@ from mopidy.utils import get_class from .current_playlist import CurrentPlaylistController from .library import LibraryController, BaseLibraryProvider from .playback import BasePlaybackController, BasePlaybackProvider -from .stored_playlists import (BaseStoredPlaylistsController, +from .stored_playlists import (StoredPlaylistsController, BaseStoredPlaylistsProvider) logger = logging.getLogger('mopidy.backends.base') @@ -57,7 +57,7 @@ class BaseBackend(object): playback = None #: The stored playlists controller. An instance of - #: :class:`mopidy.backends.base.BaseStoredPlaylistsController`. + #: :class:`mopidy.backends.base.StoredPlaylistsController`. stored_playlists = None #: List of URI prefixes this backend can handle. diff --git a/mopidy/backends/base/stored_playlists.py b/mopidy/backends/base/stored_playlists.py index bb86c92e..733ea46f 100644 --- a/mopidy/backends/base/stored_playlists.py +++ b/mopidy/backends/base/stored_playlists.py @@ -3,7 +3,7 @@ import logging logger = logging.getLogger('mopidy.backends.base') -class BaseStoredPlaylistsController(object): +class StoredPlaylistsController(object): """ :param backend: backend the controller is a part of :type backend: :class:`BaseBackend` @@ -94,7 +94,7 @@ class BaseStoredPlaylistsController(object): def refresh(self): """ Refresh the stored playlists in - :attr:`mopidy.backends.base.BaseStoredPlaylistsController.playlists`. + :attr:`mopidy.backends.base.StoredPlaylistsController.playlists`. """ return self.provider.refresh() @@ -152,7 +152,7 @@ class BaseStoredPlaylistsProvider(object): def create(self, name): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.create`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.create`. *MUST be implemented by subclass.* """ @@ -160,7 +160,7 @@ class BaseStoredPlaylistsProvider(object): def delete(self, playlist): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.delete`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.delete`. *MUST be implemented by subclass.* """ @@ -168,7 +168,7 @@ class BaseStoredPlaylistsProvider(object): def lookup(self, uri): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.lookup`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.lookup`. *MUST be implemented by subclass.* """ @@ -176,7 +176,7 @@ class BaseStoredPlaylistsProvider(object): def refresh(self): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.refresh`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.refresh`. *MUST be implemented by subclass.* """ @@ -184,7 +184,7 @@ class BaseStoredPlaylistsProvider(object): def rename(self, playlist, new_name): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.rename`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.rename`. *MUST be implemented by subclass.* """ @@ -192,7 +192,7 @@ class BaseStoredPlaylistsProvider(object): def save(self, playlist): """ - See :meth:`mopidy.backends.base.BaseStoredPlaylistsController.save`. + See :meth:`mopidy.backends.base.StoredPlaylistsController.save`. *MUST be implemented by subclass.* """ diff --git a/mopidy/backends/dummy/__init__.py b/mopidy/backends/dummy/__init__.py index 62a04567..9f3b3af1 100644 --- a/mopidy/backends/dummy/__init__.py +++ b/mopidy/backends/dummy/__init__.py @@ -1,6 +1,6 @@ from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, BasePlaybackController, BasePlaybackProvider, LibraryController, - BaseLibraryProvider, BaseStoredPlaylistsController, + BaseLibraryProvider, StoredPlaylistsController, BaseStoredPlaylistsProvider) from mopidy.models import Playlist @@ -37,7 +37,7 @@ class DummyBackend(BaseBackend): provider=playback_provider) stored_playlists_provider = DummyStoredPlaylistsProvider(backend=self) - self.stored_playlists = BaseStoredPlaylistsController(backend=self, + self.stored_playlists = StoredPlaylistsController(backend=self, provider=stored_playlists_provider) self.uri_handlers = [u'dummy:'] diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py index 59ff1fde..985a1243 100644 --- a/mopidy/backends/libspotify/__init__.py +++ b/mopidy/backends/libspotify/__init__.py @@ -2,7 +2,7 @@ import logging from mopidy import settings from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, - LibraryController, BasePlaybackController, BaseStoredPlaylistsController) + LibraryController, BasePlaybackController, StoredPlaylistsController) logger = logging.getLogger('mopidy.backends.libspotify') @@ -52,7 +52,7 @@ class LibspotifyBackend(BaseBackend): stored_playlists_provider = LibspotifyStoredPlaylistsProvider( backend=self) - self.stored_playlists = BaseStoredPlaylistsController(backend=self, + self.stored_playlists = StoredPlaylistsController(backend=self, provider=stored_playlists_provider) self.uri_handlers = [u'spotify:', u'http://open.spotify.com/'] diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index ef42f4c4..44dc727b 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -7,7 +7,7 @@ import shutil from mopidy import settings from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, LibraryController, BaseLibraryProvider, BasePlaybackController, - BasePlaybackProvider, BaseStoredPlaylistsController, + BasePlaybackProvider, StoredPlaylistsController, BaseStoredPlaylistsProvider) from mopidy.models import Playlist, Track, Album from mopidy.utils.process import pickle_connection @@ -43,7 +43,7 @@ class LocalBackend(BaseBackend): provider=playback_provider) stored_playlists_provider = LocalStoredPlaylistsProvider(backend=self) - self.stored_playlists = BaseStoredPlaylistsController(backend=self, + self.stored_playlists = StoredPlaylistsController(backend=self, provider=stored_playlists_provider) self.uri_handlers = [u'file://'] diff --git a/tests/backends/base/stored_playlists.py b/tests/backends/base/stored_playlists.py index 5bcd322c..0ac0b167 100644 --- a/tests/backends/base/stored_playlists.py +++ b/tests/backends/base/stored_playlists.py @@ -8,7 +8,7 @@ from mopidy.models import Playlist from tests import SkipTest, data_folder -class BaseStoredPlaylistsControllerTest(object): +class StoredPlaylistsControllerTest(object): def setUp(self): settings.LOCAL_PLAYLIST_PATH = tempfile.mkdtemp() settings.LOCAL_TAG_CACHE_FILE = data_folder('library_tag_cache') diff --git a/tests/backends/local/stored_playlists_test.py b/tests/backends/local/stored_playlists_test.py index 4db9e1e2..a7d9043f 100644 --- a/tests/backends/local/stored_playlists_test.py +++ b/tests/backends/local/stored_playlists_test.py @@ -16,10 +16,10 @@ from mopidy.utils.path import path_to_uri from tests import data_folder from tests.backends.base.stored_playlists import \ - BaseStoredPlaylistsControllerTest + StoredPlaylistsControllerTest from tests.backends.local import generate_song -class LocalStoredPlaylistsControllerTest(BaseStoredPlaylistsControllerTest, +class LocalStoredPlaylistsControllerTest(StoredPlaylistsControllerTest, unittest.TestCase): backend_class = LocalBackend