Honor MPC password/host format on command line option 'host'

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

diff --git a/sima/utils/config.py b/sima/utils/config.py
index f3996d3861d7f6ae04647bc3866bb679f552c8e2..182059bad0990148b68ae55a45944e7de77e4fbb 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -53,6 +53,8 @@ DEFAULT_CONF = {
             'queue_length': 2,
             'var_dir': 'empty',
             'musicbrainzid': "true",
+            'repeat_disable_queue': "true",
+            'single_disable_queue': "true",
             },
         'daemon':{
             'daemon': False,
@@ -66,15 +68,6 @@ DEFAULT_CONF = {
             'consume': 10,
             'priority': 0,
             },
-        'echonest': {
-            'queue_mode': "track", #TODO control values
-            'max_art': 15,
-            'single_album': "false",
-            'track_to_add': 1,
-            'album_to_add': 1,
-            'depth': 1,
-            'priority': 100,
-            },
         'lastfm': {
             'queue_mode': "track", #TODO control values
             'max_art': 10,
@@ -185,6 +178,13 @@ class ConfMan(object):  # CONFIG MANAGER CLASS
             for opt in self.config.options(sec):
                 if opt in list(self.startopt.keys()):
                     self.config.set(sec, opt, str(self.startopt.get(opt)))
+        # honor MPD_HOST format as in mpc(1)  for command line option --host
+        if self.startopt.get('host'):
+            if '@' in self.startopt.get('host'):
+                print(self.startopt.get('host').split('@'))
+                passwd, host = self.startopt.get('host').split('@')
+                self.config.set('MPD', 'password', passwd)
+                self.config.set('MPD', 'host', host)
 
     def use_envar(self):
         """Use MPD en.var. to set defaults"""