From 9957b3c2be965c7c5387230575eb7fe17efcdcf5 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 1 Sep 2015 23:27:39 +0200
Subject: [PATCH] local: Reintroduce local/data_dir config for the 1.1.x series

As to not break compat with mopidy-local-* in v1.1.1.
---
 mopidy/local/__init__.py | 2 +-
 mopidy/local/ext.conf    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mopidy/local/__init__.py b/mopidy/local/__init__.py
index 3ee2703e..552e5341 100644
--- a/mopidy/local/__init__.py
+++ b/mopidy/local/__init__.py
@@ -23,7 +23,7 @@ class Extension(ext.Extension):
         schema = super(Extension, self).get_config_schema()
         schema['library'] = config.String()
         schema['media_dir'] = config.Path()
-        schema['data_dir'] = config.Deprecated()
+        schema['data_dir'] = config.Path(optional=True)
         schema['playlists_dir'] = config.Deprecated()
         schema['tag_cache_file'] = config.Deprecated()
         schema['scan_timeout'] = config.Integer(
diff --git a/mopidy/local/ext.conf b/mopidy/local/ext.conf
index b37a3a7a..c8fe6b86 100644
--- a/mopidy/local/ext.conf
+++ b/mopidy/local/ext.conf
@@ -2,6 +2,7 @@
 enabled = true
 library = json
 media_dir = $XDG_MUSIC_DIR
+data_dir = $XDG_DATA_DIR/mopidy/local
 scan_timeout = 1000
 scan_flush_threshold = 100
 scan_follow_symlinks = false