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

Rename track in MPD to track_name to avoid confusion

Browse Source
This commit is contained in:
Lasse Bigum 2013-10-31 22:47:33 +01:00 committed by Stein Magnus Jodal
parent a44b7c06a5
commit 9593da08b6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
if field == 'uri':
result_tracks = filter(uri_filter, result_tracks)
elif field == 'track':
elif field == 'track_name':
result_tracks = filter(track_filter, result_tracks)
elif field == 'album':
result_tracks = filter(album_filter, result_tracks)
@ -149,7 +149,7 @@ class LocalLibraryProvider(base.BaseLibraryProvider):
if field == 'uri':
result_tracks = filter(uri_filter, result_tracks)
elif field == 'track':
elif field == 'track_name':
result_tracks = filter(track_filter, result_tracks)
elif field == 'album':
result_tracks = filter(album_filter, result_tracks)

2
mopidy/frontends/mpd/translator.py
View File

@ -234,7 +234,7 @@ def query_from_mpd_search_format(mpd_query):
m = MPD_SEARCH_QUERY_PART_RE.match(query_part)
field = m.groupdict()['field'].lower()
if field == 'title':
field = 'track'
field = 'track_name'
elif field == 'track':
field = 'track_no'
elif field in ('file', 'filename'):

16
tests/backends/local/library_test.py
View File

@ -107,7 +107,7 @@ class LocalLibraryProviderTest(unittest.TestCase):
self.assertEqual(tracks, [])
def test_find_exact_no_hits(self):
result = self.library.find_exact(track=['unknown track'])
result = self.library.find_exact(track_name=['unknown track'])
self.assertEqual(list(result[0].tracks), [])
result = self.library.find_exact(artist=['unknown artist'])
@ -144,10 +144,10 @@ class LocalLibraryProviderTest(unittest.TestCase):
self.assertEqual(list(result[0].tracks), self.tracks[1:2])
def test_find_exact_track(self):
result = self.library.find_exact(track=['track1'])
result = self.library.find_exact(track_name=['track1'])
self.assertEqual(list(result[0].tracks), self.tracks[:1])
result = self.library.find_exact(track=['track2'])
result = self.library.find_exact(track_name=['track2'])
self.assertEqual(list(result[0].tracks), self.tracks[1:2])
def test_find_exact_artist(self):
@ -240,7 +240,7 @@ class LocalLibraryProviderTest(unittest.TestCase):
test = lambda: self.library.find_exact(albumartist=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.find_exact(track=[''])
test = lambda: self.library.find_exact(track_name=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.find_exact(album=[''])
@ -256,7 +256,7 @@ class LocalLibraryProviderTest(unittest.TestCase):
self.assertRaises(LookupError, test)
def test_search_no_hits(self):
result = self.library.search(track=['unknown track'])
result = self.library.search(track_name=['unknown track'])
self.assertEqual(list(result[0].tracks), [])
result = self.library.search(artist=['unknown artist'])
@ -291,10 +291,10 @@ class LocalLibraryProviderTest(unittest.TestCase):
self.assertEqual(list(result[0].tracks), self.tracks[1:2])
def test_search_track(self):
result = self.library.search(track=['Rack1'])
result = self.library.search(track_name=['Rack1'])
self.assertEqual(list(result[0].tracks), self.tracks[:1])
result = self.library.search(track=['Rack2'])
result = self.library.search(track_name=['Rack2'])
self.assertEqual(list(result[0].tracks), self.tracks[1:2])
def test_search_artist(self):
@ -380,7 +380,7 @@ class LocalLibraryProviderTest(unittest.TestCase):
test = lambda: self.library.search(albumartist=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.search(track=[''])
test = lambda: self.library.search(track_name=[''])
self.assertRaises(LookupError, test)
test = lambda: self.library.search(album=[''])