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

local: Cleanup uri conversion helper naming and implementation.

Browse Source
This commit is contained in:
Thomas Adamcik 2013-12-04 22:48:37 +01:00
parent ad53a067ae
commit 4f7176cac8
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mopidy/backends/local/playback.py
View File

@ -11,7 +11,6 @@ logger = logging.getLogger('mopidy.backends.local')
class LocalPlaybackProvider(base.BasePlaybackProvider):
def change_track(self, track):
media_dir = self.backend.config['local']['media_dir']
uri = translator.local_to_file_uri(track.uri, media_dir)
track = track.copy(uri=uri)
track = track.copy(uri=translator.local_track_uri_to_file_uri(
track.uri, self.backend.config['local']['media_dir']))
return super(LocalPlaybackProvider, self).change_track(track)

8
mopidy/backends/local/translator.py
View File

@ -11,12 +11,8 @@ from mopidy.utils.path import path_to_uri, uri_to_path
logger = logging.getLogger('mopidy.backends.local')
# TODO: remove once tag cache is gone
def local_to_file_uri(uri, media_dir):
# TODO: check that type is correct.
file_path = uri_to_path(uri).split(b':', 1)[1]
file_path = os.path.join(media_dir, file_path)
return path_to_uri(file_path)
def local_track_uri_to_file_uri(uri, media_dir):
return path_to_uri(local_track_uri_to_path(uri, media_dir))
def local_track_uri_to_path(uri, media_dir):