diff --git a/mopidy/frontends/mpd/translator.py b/mopidy/frontends/mpd/translator.py index d820b0e0..21be37cc 100644 --- a/mopidy/frontends/mpd/translator.py +++ b/mopidy/frontends/mpd/translator.py @@ -215,14 +215,14 @@ def query_from_mpd_search_format(mpd_query): return query -def tracks_to_tag_cache_format(tracks, music_path): +def tracks_to_tag_cache_format(tracks, media_dir): """ Format list of tracks for output to MPD tag cache :param tracks: the tracks :type tracks: list of :class:`mopidy.models.Track` - :param music_path: the path to the music dir - :type music_path: string + :param media_dir: the path to the music dir + :type media_dir: string :rtype: list of lists of two-tuples """ result = [ @@ -232,13 +232,13 @@ def tracks_to_tag_cache_format(tracks, music_path): ('info_end',) ] tracks.sort(key=lambda t: t.uri) - folders, files = tracks_to_directory_tree(tracks, music_path) - _add_to_tag_cache(result, folders, files, music_path) + folders, files = tracks_to_directory_tree(tracks, media_dir) + _add_to_tag_cache(result, folders, files, media_dir) return result -def _add_to_tag_cache(result, folders, files, music_path): - base_path = music_path.encode('utf-8') +def _add_to_tag_cache(result, folders, files, media_dir): + base_path = media_dir.encode('utf-8') for path, (entry_folders, entry_files) in folders.items(): try: @@ -249,7 +249,7 @@ def _add_to_tag_cache(result, folders, files, music_path): result.append(('directory', text_path)) result.append(('mtime', get_mtime(os.path.join(base_path, path)))) result.append(('begin', name)) - _add_to_tag_cache(result, entry_folders, entry_files, music_path) + _add_to_tag_cache(result, entry_folders, entry_files, media_dir) result.append(('end', name)) result.append(('songList begin',)) @@ -275,7 +275,7 @@ def _add_to_tag_cache(result, folders, files, music_path): result.append(('songList end',)) -def tracks_to_directory_tree(tracks, music_path): +def tracks_to_directory_tree(tracks, media_dir): directories = ({}, []) for track in tracks: @@ -284,7 +284,7 @@ def tracks_to_directory_tree(tracks, music_path): absolute_track_dir_path = os.path.dirname(uri_to_path(track.uri)) relative_track_dir_path = re.sub( - '^' + re.escape(music_path), b'', absolute_track_dir_path) + '^' + re.escape(media_dir), b'', absolute_track_dir_path) for part in split_path(relative_track_dir_path): path = os.path.join(path, part) diff --git a/tests/frontends/mpd/translator_test.py b/tests/frontends/mpd/translator_test.py index 828acf1a..2f646faf 100644 --- a/tests/frontends/mpd/translator_test.py +++ b/tests/frontends/mpd/translator_test.py @@ -23,7 +23,7 @@ class TrackMpdFormatTest(unittest.TestCase): ) def setUp(self): - self.music_path = '/dir/subdir' + self.media_dir = '/dir/subdir' mtime.set_fake_time(1234567) def tearDown(self): @@ -135,14 +135,14 @@ class QueryFromMpdListFormatTest(unittest.TestCase): class TracksToTagCacheFormatTest(unittest.TestCase): def setUp(self): - self.music_path = '/dir/subdir' + self.media_dir = '/dir/subdir' mtime.set_fake_time(1234567) def tearDown(self): mtime.undo_fake() def translate(self, track): - base_path = self.music_path.encode('utf-8') + base_path = self.media_dir.encode('utf-8') result = dict(translator.track_to_mpd_format(track)) result['file'] = uri_to_path(result['file'])[len(base_path) + 1:] result['key'] = os.path.basename(result['file']) @@ -174,11 +174,11 @@ class TracksToTagCacheFormatTest(unittest.TestCase): self.fail("Couldn't find end %s in result" % directory) def test_empty_tag_cache_has_header(self): - result = translator.tracks_to_tag_cache_format([], self.music_path) + result = translator.tracks_to_tag_cache_format([], self.media_dir) result = self.consume_headers(result) def test_empty_tag_cache_has_song_list(self): - result = translator.tracks_to_tag_cache_format([], self.music_path) + result = translator.tracks_to_tag_cache_format([], self.media_dir) result = self.consume_headers(result) song_list, result = self.consume_song_list(result) @@ -187,12 +187,12 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_has_header(self): track = Track(uri='file:///dir/subdir/song.mp3') - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) def test_tag_cache_has_song_list(self): track = Track(uri='file:///dir/subdir/song.mp3') - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) song_list, result = self.consume_song_list(result) @@ -202,7 +202,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_has_formated_track(self): track = Track(uri='file:///dir/subdir/song.mp3') formated = self.translate(track) - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) song_list, result = self.consume_song_list(result) @@ -213,7 +213,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_has_formated_track_with_key_and_mtime(self): track = Track(uri='file:///dir/subdir/song.mp3') formated = self.translate(track) - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) song_list, result = self.consume_song_list(result) @@ -224,7 +224,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_suports_directories(self): track = Track(uri='file:///dir/subdir/folder/song.mp3') formated = self.translate(track) - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) folder, result = self.consume_directory(result) @@ -238,7 +238,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_diretory_header_is_right(self): track = Track(uri='file:///dir/subdir/folder/sub/song.mp3') - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) folder, result = self.consume_directory(result) @@ -250,7 +250,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): def test_tag_cache_suports_sub_directories(self): track = Track(uri='file:///dir/subdir/folder/sub/song.mp3') formated = self.translate(track) - result = translator.tracks_to_tag_cache_format([track], self.music_path) + result = translator.tracks_to_tag_cache_format([track], self.media_dir) result = self.consume_headers(result) @@ -278,7 +278,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): formated.extend(self.translate(tracks[0])) formated.extend(self.translate(tracks[1])) - result = translator.tracks_to_tag_cache_format(tracks, self.music_path) + result = translator.tracks_to_tag_cache_format(tracks, self.media_dir) result = self.consume_headers(result) song_list, result = self.consume_song_list(result) @@ -296,7 +296,7 @@ class TracksToTagCacheFormatTest(unittest.TestCase): formated.append(self.translate(tracks[0])) formated.append(self.translate(tracks[1])) - result = translator.tracks_to_tag_cache_format(tracks, self.music_path) + result = translator.tracks_to_tag_cache_format(tracks, self.media_dir) result = self.consume_headers(result) folder, result = self.consume_directory(result) @@ -312,10 +312,10 @@ class TracksToTagCacheFormatTest(unittest.TestCase): class TracksToDirectoryTreeTest(unittest.TestCase): def setUp(self): - self.music_path = '/root' + self.media_dir = '/root' def test_no_tracks_gives_emtpy_tree(self): - tree = translator.tracks_to_directory_tree([], self.music_path) + tree = translator.tracks_to_directory_tree([], self.media_dir) self.assertEqual(tree, ({}, [])) def test_top_level_files(self): @@ -324,18 +324,18 @@ class TracksToDirectoryTreeTest(unittest.TestCase): Track(uri='file:///root/file2.mp3'), Track(uri='file:///root/file3.mp3'), ] - tree = translator.tracks_to_directory_tree(tracks, self.music_path) + tree = translator.tracks_to_directory_tree(tracks, self.media_dir) self.assertEqual(tree, ({}, tracks)) def test_single_file_in_subdir(self): tracks = [Track(uri='file:///root/dir/file1.mp3')] - tree = translator.tracks_to_directory_tree(tracks, self.music_path) + tree = translator.tracks_to_directory_tree(tracks, self.media_dir) expected = ({'dir': ({}, tracks)}, []) self.assertEqual(tree, expected) def test_single_file_in_sub_subdir(self): tracks = [Track(uri='file:///root/dir1/dir2/file1.mp3')] - tree = translator.tracks_to_directory_tree(tracks, self.music_path) + tree = translator.tracks_to_directory_tree(tracks, self.media_dir) expected = ({'dir1': ({'dir1/dir2': ({}, tracks)}, [])}, []) self.assertEqual(tree, expected) @@ -347,7 +347,7 @@ class TracksToDirectoryTreeTest(unittest.TestCase): Track(uri='file:///root/dir2/file4.mp3'), Track(uri='file:///root/dir2/sub/file5.mp3'), ] - tree = translator.tracks_to_directory_tree(tracks, self.music_path) + tree = translator.tracks_to_directory_tree(tracks, self.media_dir) expected = ( { 'dir1': ({}, [tracks[1], tracks[2]]),