From cb4c6909f9150f57ea9082a4d074c8ad09df1c38 Mon Sep 17 00:00:00 2001 From: kozec Date: Sun, 12 Jul 2015 14:34:04 +0200 Subject: [PATCH] mpd: Added default_playlist_scheme to configuration --- mopidy/mpd/__init__.py | 1 + mopidy/mpd/ext.conf | 1 + mopidy/mpd/protocol/stored_playlists.py | 3 ++- tests/mpd/protocol/__init__.py | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mopidy/mpd/__init__.py b/mopidy/mpd/__init__.py index b2438b07..5d7d3972 100644 --- a/mopidy/mpd/__init__.py +++ b/mopidy/mpd/__init__.py @@ -25,6 +25,7 @@ class Extension(ext.Extension): schema['connection_timeout'] = config.Integer(minimum=1) schema['zeroconf'] = config.String(optional=True) schema['command_blacklist'] = config.List(optional=True) + schema['default_playlist_scheme'] = config.String(optional=False) return schema def validate_environment(self): diff --git a/mopidy/mpd/ext.conf b/mopidy/mpd/ext.conf index fe9a0494..ee518a86 100644 --- a/mopidy/mpd/ext.conf +++ b/mopidy/mpd/ext.conf @@ -7,3 +7,4 @@ max_connections = 20 connection_timeout = 60 zeroconf = Mopidy MPD server on $hostname command_blacklist = listall,listallinfo +default_playlist_scheme = m3u diff --git a/mopidy/mpd/protocol/stored_playlists.py b/mopidy/mpd/protocol/stored_playlists.py index fbb36fa1..9effec4f 100644 --- a/mopidy/mpd/protocol/stored_playlists.py +++ b/mopidy/mpd/protocol/stored_playlists.py @@ -186,7 +186,8 @@ def _playlistcreate(context, name, tracks): # Created and saved return # Can't use backend aprropriate to passed uri schemes, use default one - playlist = context.core.playlists.create(name).get() + scheme = context.dispatcher.config['mpd']['default_playlist_scheme'] + playlist = context.core.playlists.create(name, scheme).get() if not playlist: # If even default backend can't save playlist, everything is lost logger.warning('Default backend can\'t create playlists') diff --git a/tests/mpd/protocol/__init__.py b/tests/mpd/protocol/__init__.py index f34ad4f0..0e8157bd 100644 --- a/tests/mpd/protocol/__init__.py +++ b/tests/mpd/protocol/__init__.py @@ -36,6 +36,7 @@ class BaseTestCase(unittest.TestCase): }, 'mpd': { 'password': None, + 'default_playlist_scheme': 'dummy', } }