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

core: Check correct query fields in core

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-15 23:42:45 +02:00
parent 97235f9441
commit 2c31dbe47c
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy/core/playlists.py
View File

@ -176,7 +176,8 @@ class PlaylistsController(object):
deprecation.warn('core.playlists.filter')
criteria = criteria or kwargs
validation.check_query(criteria, list_values=False)
validation.check_query(
criteria, validation.PLAYLIST_FIELDS, list_values=False)
# TODO: stop using self playlists
matches = self.playlists

3
mopidy/core/tracklist.py
View File

@ -423,9 +423,10 @@ class TracklistController(object):
"""
criteria = criteria or kwargs
tlids = criteria.pop('tlid', [])
validation.check_query(criteria)
validation.check_query(criteria, validation.TRACKLIST_FIELDS)
validation.check_instances(tlids, int)
# TODO: deprecate kwargs
# TODO: id=[1, 2, 3] filtering can't possibly be working
matches = self._tl_tracks
for (key, values) in criteria.items():

15
mopidy/utils/validation.py
View File

@ -7,9 +7,14 @@ from mopidy import compat, exceptions
PLAYBACK_STATES = {'paused', 'stopped', 'playing'}
QUERY_FIELDS = {
SEARCH_FIELDS = {
'uri', 'track_name', 'album', 'artist', 'albumartist', 'composer',
'performer', 'track_no', 'genre', 'date', 'comment', 'any', 'name'}
'performer', 'track_no', 'genre', 'date', 'comment', 'any'}
PLAYLIST_FIELDS = {'uri', 'name'} # TODO: add length and last_modified?
TRACKLIST_FIELDS = { # TODO: add bitrate, length, disc_no, track_no, modified?
'uri', 'name', 'genre', 'date', 'comment', 'musicbrainz_id'}
DISTINCT_FIELDS = {
'artist', 'albumartist', 'album', 'composer', 'performer', 'date', 'genre'}
@ -58,7 +63,7 @@ def check_integer(arg, min=None, max=None):
'Expected number smaller or equal to %d, not %r' % (max, arg))
def check_query(arg, list_values=True):
def check_query(arg, fields=SEARCH_FIELDS, list_values=True):
# TODO: normalize name -> track_name
# TODO: normalize value -> [value]
# TODO: normalize blank -> [] or just remove field?
@ -69,8 +74,8 @@ def check_query(arg, list_values=True):
'Expected a query dictionary, not {arg!r}'.format(arg=arg))
for key, value in arg.items():
check_choice(key, QUERY_FIELDS, msg='Expected query field to be one '
'of {choices}, not {arg!r}')
check_choice(key, fields, msg='Expected query field to be one of '
'{choices}, not {arg!r}')
if list_values:
msg = 'Expected "{key}" to be list of strings, not {arg!r}'
_check_iterable(value, msg, key=key)