andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backends: Make search/find_exact accept 'uris' kwarg

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-03-30 22:19:13 +01:00
parent 1704828504
commit c54db3298f
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mopidy/backends/base.py
View File

@ -53,7 +53,7 @@ class BaseLibraryProvider(object):
def __init__(self, backend):
self.backend = backend
def find_exact(self, query=None):
def find_exact(self, query=None, uris=None):
"""
See :meth:`mopidy.core.LibraryController.find_exact`.
@ -77,7 +77,7 @@ class BaseLibraryProvider(object):
"""
pass
def search(self, query=None):
def search(self, query=None, uris=None):
"""
See :meth:`mopidy.core.LibraryController.search`.

8
mopidy/backends/local/library.py
View File

@ -35,7 +35,9 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
logger.debug('Failed to lookup %r', uri)
return []
def find_exact(self, query=None):
def find_exact(self, query=None, uris=None):
# TODO Only return results within URI roots given by ``uris``
if query is None:
query = {}
self._validate_query(query)
@ -74,7 +76,9 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
raise LookupError('Invalid lookup field: %s' % field)
return SearchResult(uri='file:search', tracks=result_tracks)
def search(self, query=None):
def search(self, query=None, uris=None):
# TODO Only return results within URI roots given by ``uris``
if query is None:
query = {}
self._validate_query(query)

8
mopidy/backends/spotify/library.py
View File

@ -62,8 +62,8 @@ class SpotifyTrack(Track):
class SpotifyLibraryProvider(base.BaseLibraryProvider):
def find_exact(self, query=None):
return self.search(query=query)
def find_exact(self, query=None, uris=None):
return self.search(query=query, uris=uris)
def lookup(self, uri):
try:
@ -131,7 +131,9 @@ class SpotifyLibraryProvider(base.BaseLibraryProvider):
def refresh(self, uri=None):
pass # TODO
def search(self, query=None):
def search(self, query=None, uris=None):
# TODO Only return results within URI roots given by ``uris``
if not query:
return self._get_all_tracks()