Add abstract unix socket support for MPD connection

[mpd-sima.git] / sima / utils / config.py

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 616a01f5bf16d26cac971d97b352cf5dd2138698..a46c0c66493e3519ab1af41cefe7d88e8087ddbf 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -139,13 +139,13 @@ class ConfMan:  # CONFIG MANAGER CLASS
         self.use_envar()
         self.startopt = options
 
         self.use_envar()
         self.startopt = options
 

-        ## INIT CALLS
+        # INIT CALLS

         self.init_config()
         self.supersedes_config_with_cmd_line_options()
         self.init_config()
         self.supersedes_config_with_cmd_line_options()

-        # Controls files access
-        self.control_facc()

         # set dbfile
         self.config['sima']['db_file'] = join(self.config['sima']['var_dir'], 'sima.db')
         # set dbfile
         self.config['sima']['db_file'] = join(self.config['sima']['var_dir'], 'sima.db')

+        # Controls files access
+        self.control_facc()

 
         # Create directories
         data_dir = self.config['sima']['var_dir']
 
         # Create directories
         data_dir = self.config['sima']['var_dir']


@@ -158,11 +158,12 @@ class ConfMan:  # CONFIG MANAGER CLASS
         """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
         """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.
+        argparse. Also add config['sima']['db_file'] contructed here in init

         """
         ok = True
         for op, ftochk in [('logfile', self.config.get('log', 'logfile')),
         """
         ok = True
         for op, ftochk in [('logfile', self.config.get('log', 'logfile')),

-                           ('pidfile', self.config.get('daemon', 'pidfile')),]:
+                           ('pidfile', self.config.get('daemon', 'pidfile')),
+                           ('db file', self.config.get('sima', 'db_file'))]:

             if not ftochk:
                 continue
             if isdir(ftochk):
             if not ftochk:
                 continue
             if isdir(ftochk):


@@ -179,8 +180,6 @@ class ConfMan:  # CONFIG MANAGER CLASS
                     self.log.critical('no write access to "%s" (%s)', ftochk, op)
                     ok = False
         if not ok:
                     self.log.critical('no write access to "%s" (%s)', ftochk, op)
                     ok = False
         if not ok:

-            if exists(self.conf_file):
-                self.log.warning('Try to check the configuration file: %s', self.conf_file)

             sys.exit(2)
 
     def control_mod(self):
             sys.exit(2)
 
     def control_mod(self):


@@ -205,9 +204,11 @@ class ConfMan:  # CONFIG MANAGER CLASS
         # honor MPD_HOST format as in mpc(1)  for command line option --host
         if self.startopt.get('host'):
             if '@' in self.startopt.get('host'):
         # honor MPD_HOST format as in mpc(1)  for command line option --host
         if self.startopt.get('host'):
             if '@' in self.startopt.get('host'):

-                passwd, host = self.startopt.get('host').split('@')
-                self.config.set('MPD', 'password', passwd)
-                self.config.set('MPD', 'host', host)
+                host, passwd = utils.parse_mpd_host(self.startopt.get('host'))
+                if passwd:
+                    self.config.set('MPD', 'password', passwd)
+                if host:
+                    self.config.set('MPD', 'host', host)

 
     def use_envar(self):
         """Use MPD en.var. to set defaults"""
 
     def use_envar(self):
         """Use MPD en.var. to set defaults"""


@@ -245,6 +246,7 @@ class ConfMan:  # CONFIG MANAGER CLASS
             pass
         elif environ.get('XDG_CONFIG_HOME'):
             conf_dir = join(environ.get('XDG_CONFIG_HOME'), DIRNAME)
             pass
         elif environ.get('XDG_CONFIG_HOME'):
             conf_dir = join(environ.get('XDG_CONFIG_HOME'), DIRNAME)

+            self.conf_file = join(conf_dir, CONF_FILE)

         elif homedir and isdir(homedir) and homedir not in ['/']:
             conf_dir = join(homedir, '.config', DIRNAME)
             self.conf_file = join(conf_dir, CONF_FILE)
         elif homedir and isdir(homedir) and homedir not in ['/']:
             conf_dir = join(homedir, '.config', DIRNAME)
             self.conf_file = join(conf_dir, CONF_FILE)


@@ -253,7 +255,7 @@ class ConfMan:  # CONFIG MANAGER CLASS
             self.log.critical('Please use "--config" to locate the conf file')
             sys.exit(1)
 
             self.log.critical('Please use "--config" to locate the conf file')
             sys.exit(1)
 

-        ## Sima sqlite DB
+        # Sima sqlite DB

         self.config['sima']['var_dir'] = join(data_dir)
 
         # If no conf file present, uses defaults
         self.config['sima']['var_dir'] = join(data_dir)
 
         # If no conf file present, uses defaults