# -*- coding: utf-8 -*-
-# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2013, 2014, 2015 Jack Kaliko <kaliko@azylum.org>
#
# This file is part of sima
#
# DEFAULTS
DIRNAME = 'mpd_sima'
-CONF_FILE = 'sima.cfg'
+CONF_FILE = 'mpd_sima.cfg'
DEFAULT_CONF = {
'MPD': {
'contrib': "",
'user_db': "false",
'history_duration': 8,
- 'queue_length': 1,
+ 'queue_length': 2,
'var_dir': 'empty',
+ 'musicbrainzid': "true",
},
'daemon':{
'daemon': False,
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)
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):