From f16a70d2e4b94b56fdb3dd941739ca8255b38e23 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 23 Mar 2010 01:01:48 +0100
Subject: [PATCH] Create ~/.mopidy in main and not when importing settings

---
 mopidy/__main__.py | 3 ++-
 mopidy/settings.py | 4 +---
 mopidy/utils.py    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index efe74da7..aad44375 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -10,13 +10,14 @@ sys.path.insert(0,
 
 from mopidy import get_version, settings, SettingsError
 from mopidy.process import CoreProcess
-from mopidy.utils import get_class
+from mopidy.utils import get_class, get_or_create_dotdir
 
 logger = logging.getLogger('mopidy.main')
 
 def main():
     options, args = _parse_options()
     _setup_logging(options.verbosity_level)
+    get_or_create_dotdir('~/.mopidy/')
     core_queue = multiprocessing.Queue()
     get_class(settings.SERVER)(core_queue)
     core = CoreProcess(core_queue)
diff --git a/mopidy/settings.py b/mopidy/settings.py
index 90163c45..8e9fb291 100644
--- a/mopidy/settings.py
+++ b/mopidy/settings.py
@@ -11,8 +11,6 @@ from __future__ import absolute_import
 import os
 import sys
 
-from mopidy.utils import get_or_create_dotdir
-
 #: List of playback backends to use. Default::
 #:
 #:     BACKENDS = (u'mopidy.backends.despotify.DespotifyBackend',)
@@ -97,7 +95,7 @@ SPOTIFY_USERNAME = u''
 SPOTIFY_PASSWORD = u''
 
 # Import user specific settings
-dotdir = get_or_create_dotdir()
+dotdir = os.path.expanduser(u'~/.mopidy/')
 settings_file = os.path.join(dotdir, u'settings.py')
 if not os.path.isfile(settings_file):
     logger.warning(u'Settings not found: %s', settings_file)
diff --git a/mopidy/utils.py b/mopidy/utils.py
index 697c48f4..0142e15c 100644
--- a/mopidy/utils.py
+++ b/mopidy/utils.py
@@ -22,8 +22,8 @@ def get_class(name):
     class_object = getattr(module, class_name)
     return class_object
 
-def get_or_create_dotdir():
-    dotdir = os.path.expanduser(u'~/.mopidy/')
+def get_or_create_dotdir(dotdir):
+    dotdir = os.path.expanduser(dotdir)
     if not os.path.isdir(dotdir):
         logger.info(u'Creating %s', dotdir)
         os.mkdir(dotdir, 0755)