From 335c4d9fd8ca4f4bf1642da72b3025e37727d05e Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 8 Apr 2013 20:42:33 +0200 Subject: [PATCH] main/path: Inline constants used once --- mopidy/__main__.py | 7 ++++--- mopidy/utils/path.py | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 94e245d0..ea7bea32 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -309,9 +309,10 @@ def validate_config(raw_config, schemas, extensions=None): def create_file_structures(): - path.get_or_create_folder(path.DATA_PATH) - path.get_or_create_folder(path.CONFIG_PATH) - path.get_or_create_file(path.CONFIG_FILE) + path.get_or_create_folder(path.expand_path('$XDG_DATA_DIR/mopidy')) + path.get_or_create_folder(path.expand_path('$XDG_CONFIG_DIR/mopidy')) + path.get_or_create_file( + path.expand_path('$XDG_CONFIG_DIR/mopidy/mopidy.conf')) def setup_audio(config): diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index 88b8be3e..bcd610da 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -25,11 +25,6 @@ XDG_DIRS = { 'XDG_DATA_DIR': XDG_DATA_DIR, 'XDG_MUSIC_DIR': XDG_MUSIC_DIR, } -DATA_PATH = os.path.join(unicode(XDG_DATA_DIR), 'mopidy') -CONFIG_PATH = os.path.join(unicode(XDG_CONFIG_DIR), 'mopidy') -CONFIG_FILE = os.path.join(unicode(CONFIG_PATH), 'mopidy.conf') -SETTINGS_PATH = os.path.join(unicode(XDG_CONFIG_DIR), 'mopidy') -SETTINGS_FILE = os.path.join(unicode(SETTINGS_PATH), 'settings.py') def get_or_create_folder(folder):