From 36266064d324dd6c99a1610084ecb3c165045dc0 Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Fri, 5 Apr 2013 22:50:31 +0200
Subject: [PATCH] config: Switch all paths and files to use the Path in
 schemas.

Also renames static_dir to static_path for better consistency.
---
 mopidy/backends/local/__init__.py   | 6 +++---
 mopidy/backends/spotify/__init__.py | 2 +-
 mopidy/config.py                    | 2 +-
 mopidy/frontends/http/__init__.py   | 4 ++--
 mopidy/frontends/mpris/__init__.py  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py
index 17fd659e..54a1c7a4 100644
--- a/mopidy/backends/local/__init__.py
+++ b/mopidy/backends/local/__init__.py
@@ -55,9 +55,9 @@ class Extension(ext.Extension):
 
     def get_config_schema(self):
         schema = config.ExtensionConfigSchema()
-        schema['music_path'] = config.String()
-        schema['playlist_path'] = config.String()
-        schema['tag_cache_file'] = config.String()
+        schema['music_path'] = config.Path()
+        schema['playlist_path'] = config.Path()
+        schema['tag_cache_file'] = config.Path()
         return schema
 
     def validate_environment(self):
diff --git a/mopidy/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py
index b03849eb..6de15aab 100644
--- a/mopidy/backends/spotify/__init__.py
+++ b/mopidy/backends/spotify/__init__.py
@@ -80,7 +80,7 @@ class Extension(ext.Extension):
         schema['password'] = config.String(secret=True)
         schema['bitrate'] = config.Integer(choices=(96, 160, 320))
         schema['timeout'] = config.Integer(minimum=0)
-        schema['cache_path'] = config.String()
+        schema['cache_path'] = config.Path()
         schema['proxy_hostname'] = config.Hostname(optional=True)
         schema['proxy_username'] = config.String(optional=True)
         schema['proxy_password'] = config.String(optional=True, secret=True)
diff --git a/mopidy/config.py b/mopidy/config.py
index 85feffcc..4335f877 100644
--- a/mopidy/config.py
+++ b/mopidy/config.py
@@ -22,7 +22,7 @@ config_schemas = {}  # TODO: use ordered dict?
 config_schemas['logging'] = config.ConfigSchema()
 config_schemas['logging']['console_format'] = config.String()
 config_schemas['logging']['debug_format'] = config.String()
-config_schemas['logging']['debug_file'] = config.String()
+config_schemas['logging']['debug_file'] = config.Path()
 
 config_schemas['logging.levels'] = config.LogLevelConfigSchema()
 
diff --git a/mopidy/frontends/http/__init__.py b/mopidy/frontends/http/__init__.py
index d588a376..4ca1d9b4 100644
--- a/mopidy/frontends/http/__init__.py
+++ b/mopidy/frontends/http/__init__.py
@@ -31,7 +31,7 @@ port = 6680
 # Change this to have Mopidy serve e.g. files for your JavaScript client.
 # "/mopidy" will continue to work as usual even if you change this setting.
 #
-static_dir =
+static_path =
 
 [logging.levels]
 cherrypy = warning
@@ -533,7 +533,7 @@ class Extension(ext.Extension):
         schema = config.ExtensionConfigSchema()
         schema['hostname'] = config.Hostname()
         schema['port'] = config.Port()
-        schema['static_dir'] = config.String(optional=True)
+        schema['static_path'] = config.Path(optional=True)
         return schema
 
     def validate_environment(self):
diff --git a/mopidy/frontends/mpris/__init__.py b/mopidy/frontends/mpris/__init__.py
index 79806c47..82d15e9d 100644
--- a/mopidy/frontends/mpris/__init__.py
+++ b/mopidy/frontends/mpris/__init__.py
@@ -79,7 +79,7 @@ class Extension(ext.Extension):
 
     def get_config_schema(self):
         schema = config.ExtensionConfigSchema()
-        schema['desktop_file'] = config.String()
+        schema['desktop_file'] = config.Path()
         return schema
 
     def validate_environment(self):