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

mpd: Allow 'count' without quotes around the 'tag' param

Browse Source 
Fix hechtus/mopidy-gmusic#1
This commit is contained in:
Stein Magnus Jodal 2013-07-09 11:22:45 +02:00
parent 0a61b4642e
commit 99eed0e6b8
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mopidy/frontends/mpd/protocol/music_db.py
View File

@ -39,7 +39,7 @@ def _artist_as_track(artist):
artists=[artist]) artists=[artist])
@handle_request(r'^count "(?P<tag>[^"]+)" "(?P<needle>[^"]*)"$') @handle_request(r'^count "?(?P<tag>[^"]+)"? "(?P<needle>[^"]*)"$')
def count(context, tag, needle): def count(context, tag, needle):
""" """
*musicpd.org, music database section:* *musicpd.org, music database section:*
@ -48,6 +48,10 @@ def count(context, tag, needle):
Counts the number of songs and their total playtime in the db Counts the number of songs and their total playtime in the db
matching ``TAG`` exactly. matching ``TAG`` exactly.
*GMPC:*
- does not add quotes around the tag argument.
""" """
return [('songs', 0), ('playtime', 0)] # TODO return [('songs', 0), ('playtime', 0)] # TODO

6
tests/frontends/mpd/protocol/music_db_test.py
View File

@ -12,6 +12,12 @@ class MusicDatabaseHandlerTest(protocol.BaseTestCase):
self.assertInResponse('playtime: 0') self.assertInResponse('playtime: 0')
self.assertInResponse('OK') self.assertInResponse('OK')
def test_count_without_quotes(self):
self.sendRequest('count tag "needle"')
self.assertInResponse('songs: 0')
self.assertInResponse('playtime: 0')
self.assertInResponse('OK')
def test_findadd(self): def test_findadd(self):
self.backend.library.dummy_find_exact_result = SearchResult( self.backend.library.dummy_find_exact_result = SearchResult(
tracks=[Track(uri='dummy:a', name='A')]) tracks=[Track(uri='dummy:a', name='A')])