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

Strip invalid characters from playlist names for MPD frontend

Browse Source 
Fixes mopidy/mopidy$480 and mopidy/mopidy#474
This commit is contained in:
alzeih 2013-07-30 13:57:29 +12:00
parent 608b9c9b6c
commit 6c7566a2f3
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mopidy/frontends/mpd/dispatcher.py
View File

@ -236,6 +236,9 @@ class MpdContext(object):
#: The subsytems that we want to be notified about in idle mode.
subscriptions = None
#regex for invalid characters in playlist names
_invalid_playlist_chars = re.compile(r'[\n\t\\/]')
def __init__(self, dispatcher, session=None, config=None, core=None):
self.dispatcher = dispatcher
self.session = session
@ -248,10 +251,11 @@ class MpdContext(object):
self.refresh_playlists_mapping()
def create_unique_name(self, playlist_name):
name = playlist_name
stripped_name = self._invalid_playlist_chars.sub(' ', playlist_name)
name = stripped_name
i = 2
while name in self._playlist_uri_from_name:
name = '%s [%d]' % (playlist_name, i)
name = '%s [%d]' % (stripped_name, i)
i += 1
return name