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

mpd: Handle paths as bytes with unknown encoding, not UTF-8 or Unicode

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-03-31 16:46:03 +02:00
parent c25a6e4c78
commit 4f8907bbeb
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,12 +142,6 @@ def _convert_mpd_data(data, tracks, music_dir):
albumartist_kwargs[b'musicbrainz_id'] = ( albumartist_kwargs[b'musicbrainz_id'] = (
data['musicbrainz_albumartistid']) data['musicbrainz_albumartistid'])
if data['file'][0] == '/':
path = data['file'][1:]
else:
path = data['file']
path = urllib.unquote(path.encode('ascii')).decode('utf-8')
if artist_kwargs: if artist_kwargs:
artist = Artist(**artist_kwargs) artist = Artist(**artist_kwargs)
track_kwargs[b'artists'] = [artist] track_kwargs[b'artists'] = [artist]
@ -160,7 +154,19 @@ def _convert_mpd_data(data, tracks, music_dir):
album = Album(**album_kwargs) album = Album(**album_kwargs)
track_kwargs[b'album'] = album track_kwargs[b'album'] = album
if data['file'][0] == '/':
path = data['file'][1:]
else:
path = data['file']
path = urllib.unquote(path.encode('utf-8'))
if isinstance(music_dir, unicode):
music_dir = music_dir.encode('utf-8')
# Make sure we only pass bytestrings to path_to_uri to avoid implicit
# decoding of bytestrings to unicode strings
track_kwargs[b'uri'] = path_to_uri(music_dir, path) track_kwargs[b'uri'] = path_to_uri(music_dir, path)
track_kwargs[b'length'] = int(data.get('time', 0)) * 1000 track_kwargs[b'length'] = int(data.get('time', 0)) * 1000
track = Track(**track_kwargs) track = Track(**track_kwargs)