From 5ada4709bdfd5a20ec809edd4f64817ce662a608 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Tue, 2 Nov 2010 23:54:02 +0100 Subject: [PATCH] Rename {Base => }LibraryController --- docs/api/backends/controllers.rst | 2 +- mopidy/backends/base/__init__.py | 4 ++-- mopidy/backends/base/library.py | 10 +++++----- mopidy/backends/dummy/__init__.py | 4 ++-- mopidy/backends/libspotify/__init__.py | 5 ++--- mopidy/backends/local/__init__.py | 4 ++-- tests/backends/base/library.py | 2 +- tests/backends/local/library_test.py | 4 ++-- 8 files changed, 17 insertions(+), 18 deletions(-) diff --git a/docs/api/backends/controllers.rst b/docs/api/backends/controllers.rst index 16ecc9b6..d3346a27 100644 --- a/docs/api/backends/controllers.rst +++ b/docs/api/backends/controllers.rst @@ -60,6 +60,6 @@ Library controller Manages the music library, e.g. searching for tracks to be added to a playlist. -.. autoclass:: mopidy.backends.base.BaseLibraryController +.. autoclass:: mopidy.backends.base.LibraryController :members: :undoc-members: diff --git a/mopidy/backends/base/__init__.py b/mopidy/backends/base/__init__.py index 39ad6e9e..529c2179 100644 --- a/mopidy/backends/base/__init__.py +++ b/mopidy/backends/base/__init__.py @@ -9,7 +9,7 @@ from mopidy.models import Playlist from mopidy.utils import get_class from .current_playlist import CurrentPlaylistController -from .library import BaseLibraryController, BaseLibraryProvider +from .library import LibraryController, BaseLibraryProvider from .playback import BasePlaybackController, BasePlaybackProvider from .stored_playlists import (BaseStoredPlaylistsController, BaseStoredPlaylistsProvider) @@ -46,7 +46,7 @@ class BaseBackend(object): current_playlist = None #: The library controller. An instance of - # :class:`mopidy.backends.base.BaseLibraryController`. + # :class:`mopidy.backends.base.LibraryController`. library = None #: The sound mixer. An instance of :class:`mopidy.mixers.BaseMixer`. diff --git a/mopidy/backends/base/library.py b/mopidy/backends/base/library.py index a1df83cd..697d3554 100644 --- a/mopidy/backends/base/library.py +++ b/mopidy/backends/base/library.py @@ -2,7 +2,7 @@ import logging logger = logging.getLogger('mopidy.backends.base') -class BaseLibraryController(object): +class LibraryController(object): """ :param backend: backend the controller is a part of :type backend: :class:`BaseBackend` @@ -93,7 +93,7 @@ class BaseLibraryProvider(object): def find_exact(self, **query): """ - See :meth:`mopidy.backends.base.BaseLibraryController.find_exact`. + See :meth:`mopidy.backends.base.LibraryController.find_exact`. *MUST be implemented by subclass.* """ @@ -101,7 +101,7 @@ class BaseLibraryProvider(object): def lookup(self, uri): """ - See :meth:`mopidy.backends.base.BaseLibraryController.lookup`. + See :meth:`mopidy.backends.base.LibraryController.lookup`. *MUST be implemented by subclass.* """ @@ -109,7 +109,7 @@ class BaseLibraryProvider(object): def refresh(self, uri=None): """ - See :meth:`mopidy.backends.base.BaseLibraryController.refresh`. + See :meth:`mopidy.backends.base.LibraryController.refresh`. *MUST be implemented by subclass.* """ @@ -117,7 +117,7 @@ class BaseLibraryProvider(object): def search(self, **query): """ - See :meth:`mopidy.backends.base.BaseLibraryController.search`. + See :meth:`mopidy.backends.base.LibraryController.search`. *MUST be implemented by subclass.* """ diff --git a/mopidy/backends/dummy/__init__.py b/mopidy/backends/dummy/__init__.py index 00f8c9f2..62a04567 100644 --- a/mopidy/backends/dummy/__init__.py +++ b/mopidy/backends/dummy/__init__.py @@ -1,5 +1,5 @@ from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, - BasePlaybackController, BasePlaybackProvider, BaseLibraryController, + BasePlaybackController, BasePlaybackProvider, LibraryController, BaseLibraryProvider, BaseStoredPlaylistsController, BaseStoredPlaylistsProvider) from mopidy.models import Playlist @@ -29,7 +29,7 @@ class DummyBackend(BaseBackend): self.current_playlist = CurrentPlaylistController(backend=self) library_provider = DummyLibraryProvider(backend=self) - self.library = BaseLibraryController(backend=self, + self.library = LibraryController(backend=self, provider=library_provider) playback_provider = DummyPlaybackProvider(backend=self) diff --git a/mopidy/backends/libspotify/__init__.py b/mopidy/backends/libspotify/__init__.py index 450ac7be..59ff1fde 100644 --- a/mopidy/backends/libspotify/__init__.py +++ b/mopidy/backends/libspotify/__init__.py @@ -2,8 +2,7 @@ import logging from mopidy import settings from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, - BaseLibraryController, BasePlaybackController, - BaseStoredPlaylistsController) + LibraryController, BasePlaybackController, BaseStoredPlaylistsController) logger = logging.getLogger('mopidy.backends.libspotify') @@ -44,7 +43,7 @@ class LibspotifyBackend(BaseBackend): self.current_playlist = CurrentPlaylistController(backend=self) library_provider = LibspotifyLibraryProvider(backend=self) - self.library = BaseLibraryController(backend=self, + self.library = LibraryController(backend=self, provider=library_provider) playback_provider = LibspotifyPlaybackProvider(backend=self) diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index 0c624687..ef42f4c4 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -6,7 +6,7 @@ import shutil from mopidy import settings from mopidy.backends.base import (BaseBackend, CurrentPlaylistController, - BaseLibraryController, BaseLibraryProvider, BasePlaybackController, + LibraryController, BaseLibraryProvider, BasePlaybackController, BasePlaybackProvider, BaseStoredPlaylistsController, BaseStoredPlaylistsProvider) from mopidy.models import Playlist, Track, Album @@ -35,7 +35,7 @@ class LocalBackend(BaseBackend): self.current_playlist = CurrentPlaylistController(backend=self) library_provider = LocalLibraryProvider(backend=self) - self.library = BaseLibraryController(backend=self, + self.library = LibraryController(backend=self, provider=library_provider) playback_provider = LocalPlaybackProvider(backend=self) diff --git a/tests/backends/base/library.py b/tests/backends/base/library.py index 1239bd08..71f62147 100644 --- a/tests/backends/base/library.py +++ b/tests/backends/base/library.py @@ -3,7 +3,7 @@ from mopidy.models import Playlist, Track, Album, Artist from tests import SkipTest, data_folder -class BaseLibraryControllerTest(object): +class LibraryControllerTest(object): artists = [Artist(name='artist1'), Artist(name='artist2'), Artist()] albums = [Album(name='album1', artists=artists[:1]), Album(name='album2', artists=artists[1:2]), diff --git a/tests/backends/local/library_test.py b/tests/backends/local/library_test.py index 34465d09..0c44924a 100644 --- a/tests/backends/local/library_test.py +++ b/tests/backends/local/library_test.py @@ -10,9 +10,9 @@ from mopidy import settings from mopidy.backends.local import LocalBackend from tests import data_folder -from tests.backends.base.library import BaseLibraryControllerTest +from tests.backends.base.library import LibraryControllerTest -class LocalLibraryControllerTest(BaseLibraryControllerTest, unittest.TestCase): +class LocalLibraryControllerTest(LibraryControllerTest, unittest.TestCase): backend_class = LocalBackend