From 2b3e976bc9598d10ce30176ccfa76b25307c67e3 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Wed, 20 May 2015 23:14:46 +0200 Subject: [PATCH] core: Update title distinct name to track --- mopidy/core/library.py | 2 +- mopidy/local/json.py | 2 +- mopidy/mpd/protocol/music_db.py | 2 +- tests/mpd/protocol/test_music_db.py | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mopidy/core/library.py b/mopidy/core/library.py index ed0b292e..3cfb390c 100644 --- a/mopidy/core/library.py +++ b/mopidy/core/library.py @@ -85,7 +85,7 @@ class LibraryController(object): protocol supports in a more sane fashion. Other frontends are not recommended to use this method. - :param string field: One of ``title``, ``artist``, ``albumartist``, + :param string field: One of ``track``, ``artist``, ``albumartist``, ``album``, ``composer``, ``performer``, ``date``or ``genre``. :param dict query: Query to use for limiting results, see :meth:`search` for details about the query format. diff --git a/mopidy/local/json.py b/mopidy/local/json.py index a7500505..0945f86f 100644 --- a/mopidy/local/json.py +++ b/mopidy/local/json.py @@ -141,7 +141,7 @@ class JsonLibrary(local.Library): return [] def get_distinct(self, field, query=None): - if field == 'title': + if field == 'track': def distinct(track): return {track.name} elif field == 'artist': diff --git a/mopidy/mpd/protocol/music_db.py b/mopidy/mpd/protocol/music_db.py index 9f1aaf4c..de800f4b 100644 --- a/mopidy/mpd/protocol/music_db.py +++ b/mopidy/mpd/protocol/music_db.py @@ -22,7 +22,7 @@ _SEARCH_MAPPING = { 'track': 'track_no'} _LIST_MAPPING = { - 'title': 'title', + 'title': 'track', 'album': 'album', 'albumartist': 'albumartist', 'artist': 'artist', diff --git a/tests/mpd/protocol/test_music_db.py b/tests/mpd/protocol/test_music_db.py index b9fbcdf6..32fb3e25 100644 --- a/tests/mpd/protocol/test_music_db.py +++ b/tests/mpd/protocol/test_music_db.py @@ -624,6 +624,11 @@ class MusicDatabaseListTest(protocol.BaseTestCase): self.send_request('list "foo"') self.assertEqualResponse('ACK [2@0] {list} incorrect arguments') + # Track title + def test_list_title(self): + self.send_request('list "title"') + self.assertInResponse('OK') + # Artist def test_list_artist_with_quotes(self):