X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Fconfig.py;h=0e775ecc54d5c1294daebdc643b1250fe3037d0f;hb=1481a05d7060c8cfd615850b3df9d66a52fb0ff4;hp=786208afcc84dc870f40fa2f88cecd67609e6c41;hpb=18053c8b0d6b11136678c8a8f5fedff3058a7523;p=mpd-sima.git diff --git a/sima/utils/config.py b/sima/utils/config.py index 786208a..0e775ec 100644 --- a/sima/utils/config.py +++ b/sima/utils/config.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko +# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko # # This file is part of sima # @@ -37,7 +37,7 @@ from . import utils # DEFAULTS DIRNAME = 'mpd_sima' -CONF_FILE = 'sima.cfg' +CONF_FILE = 'mpd_sima.cfg' DEFAULT_CONF = { 'MPD': { @@ -50,8 +50,9 @@ DEFAULT_CONF = { 'contrib': "", 'user_db': "false", 'history_duration': 8, - 'queue_length': 1, + 'queue_length': 2, 'var_dir': 'empty', + 'musicbrainzid': "true", }, 'daemon':{ 'daemon': False, @@ -126,13 +127,19 @@ class ConfMan(object): # CONFIG MANAGER CLASS self.config['sima']['db_file'] = join(self.config['sima']['var_dir'], 'sima.db') def control_facc(self): - """TODO: redundant with startopt cli args controls + """Controls file access. + This is relevant only for file provided through the configuration file + since files provided on the command line are already checked with + argparse. """ ok = True for op, ftochk in [('log', self.config['log']['logfile']), ('pidfile', self.config['daemon']['pidfile']),]: if not ftochk: continue + if isdir(ftochk): + self.log.critical('Need a file not a directory: "{}"'.format(ftochk)) + ok = False if not exists(ftochk): # Is parent directory writable then filedir = dirname(ftochk) @@ -141,9 +148,11 @@ class ConfMan(object): # CONFIG MANAGER CLASS ok = False else: if not access(ftochk, W_OK): - self.log.critical('no write access to "{0}" ({1}))'.format(ftochk, op)) + self.log.critical('no write access to "{0}" ({1})'.format(ftochk, op)) ok = False if not ok: + if exists(self.conf_file): + self.log.warning('Try to check the configuration file: {}'.format(self.conf_file)) sys.exit(2) def control_mod(self):