andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create ~/.mopidy in main and not when importing settings

Browse Source
This commit is contained in:
Stein Magnus Jodal 2010-03-23 01:01:48 +01:00
parent 861f4957aa
commit f16a70d2e4
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mopidy/__main__.py
View File

@ -10,13 +10,14 @@ sys.path.insert(0,
from mopidy import get_version, settings, SettingsError from mopidy import get_version, settings, SettingsError
from mopidy.process import CoreProcess 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') logger = logging.getLogger('mopidy.main')
def main(): def main():
options, args = _parse_options() options, args = _parse_options()
_setup_logging(options.verbosity_level) _setup_logging(options.verbosity_level)
get_or_create_dotdir('~/.mopidy/')
core_queue = multiprocessing.Queue() core_queue = multiprocessing.Queue()
get_class(settings.SERVER)(core_queue) get_class(settings.SERVER)(core_queue)
core = CoreProcess(core_queue) core = CoreProcess(core_queue)

4
mopidy/settings.py
View File

@ -11,8 +11,6 @@ from __future__ import absolute_import
import os import os
import sys import sys
from mopidy.utils import get_or_create_dotdir
#: List of playback backends to use. Default:: #: List of playback backends to use. Default::
#: #:
#: BACKENDS = (u'mopidy.backends.despotify.DespotifyBackend',) #: BACKENDS = (u'mopidy.backends.despotify.DespotifyBackend',)
@ -97,7 +95,7 @@ SPOTIFY_USERNAME = u''
SPOTIFY_PASSWORD = u'' SPOTIFY_PASSWORD = u''
# Import user specific settings # Import user specific settings
dotdir = get_or_create_dotdir() dotdir = os.path.expanduser(u'~/.mopidy/')
settings_file = os.path.join(dotdir, u'settings.py') settings_file = os.path.join(dotdir, u'settings.py')
if not os.path.isfile(settings_file): if not os.path.isfile(settings_file):
logger.warning(u'Settings not found: %s', settings_file) logger.warning(u'Settings not found: %s', settings_file)

4
mopidy/utils.py
View File

@ -22,8 +22,8 @@ def get_class(name):
class_object = getattr(module, class_name) class_object = getattr(module, class_name)
return class_object return class_object
def get_or_create_dotdir(): def get_or_create_dotdir(dotdir):
dotdir = os.path.expanduser(u'~/.mopidy/') dotdir = os.path.expanduser(dotdir)
if not os.path.isdir(dotdir): if not os.path.isdir(dotdir):
logger.info(u'Creating %s', dotdir) logger.info(u'Creating %s', dotdir)
os.mkdir(dotdir, 0755) os.mkdir(dotdir, 0755)