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

m3u: Replace slashes in playlist names with pipes.

Browse Source
This commit is contained in:
Thomas Kemmer 2015-03-25 05:36:03 +01:00
parent 394081ae27
commit a9393c3850
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mopidy/m3u/playlists.py
View File

@ -4,6 +4,7 @@ import glob
import logging
import operator
import os
import re
import sys
from mopidy import backend
@ -15,6 +16,10 @@ logger = logging.getLogger(__name__)
class M3UPlaylistsProvider(backend.PlaylistsProvider):
# TODO: currently this only handles UNIX file systems
_invalid_filename_chars = re.compile(r'[/]')
def __init__(self, *args, **kwargs):
super(M3UPlaylistsProvider, self).__init__(*args, **kwargs)
@ -89,8 +94,10 @@ class M3UPlaylistsProvider(backend.PlaylistsProvider):
file_handle.write('#EXTINF:' + str(runtime) + ',' + title + '\n')
def _sanitize_m3u_name(self, name, encoding=sys.getfilesystemencoding()):
name = self._invalid_filename_chars.sub('|', name.strip())
# make sure we end up with a valid path segment
name = name.encode(encoding, errors='replace')
name = os.path.basename(name)
name = os.path.basename(name) # paranoia?
name = name.decode(encoding)
return name

4
tests/m3u/test_playlists.py
View File

@ -50,8 +50,8 @@ class M3UPlaylistsProviderTest(unittest.TestCase):
self.assertTrue(os.path.exists(path))
def test_create_sanitizes_playlist_name(self):
playlist = self.core.playlists.create('../../test FOO baR')
self.assertEqual('test FOO baR', playlist.name)
playlist = self.core.playlists.create(' ../../test FOO baR ')
self.assertEqual('..|..|test FOO baR', playlist.name)
path = playlist_uri_to_path(playlist.uri, self.playlists_dir)
self.assertEqual(self.playlists_dir, os.path.dirname(path))
self.assertTrue(os.path.exists(path))