X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Futils%2Fconfig.py;h=26c227a938278b1f0f97595561e6cd51d563b79d;hb=d6e8ace21cc07eeb274c4c9280b0fe35479befaf;hp=c7dbab6c4c5e5bc85043b0d6063bb616e5f374db;hpb=5155de9f17342ee68f19196d7658751883f4145a;p=mpd-sima.git diff --git a/sima/utils/config.py b/sima/utils/config.py index c7dbab6..26c227a 100644 --- a/sima/utils/config.py +++ b/sima/utils/config.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2009-2015, 2019 kaliko +# Copyright (c) 2009-2015, 2019-2021 kaliko # Copyright (c) 2019 sacha # # This file is part of sima @@ -87,11 +87,31 @@ DEFAULT_CONF = { 'track_to_add': 1, 'priority': 50, }, + 'tags': { + 'comment': "", + 'date': "", + 'genre': "", + 'label': "", + 'originaldate': "", + 'filter': "", + 'queue_mode': "track", + 'single_album': "false", + 'track_to_add': 1, + 'album_to_add': 1, + 'priority': 80, + }, + 'genre': { + 'queue_mode': "track", + 'single_album': "false", + 'track_to_add': 1, + 'album_to_add': 1, + 'priority': 80, + }, } # -class ConfMan(object): # CONFIG MANAGER CLASS +class ConfMan: # CONFIG MANAGER CLASS """ Configuration manager. Default configuration is stored in DEFAULT_CONF dictionnary. @@ -130,7 +150,7 @@ class ConfMan(object): # CONFIG MANAGER CLASS # Create directories data_dir = self.config['sima']['var_dir'] if not isdir(data_dir): - self.log.trace('Creating "{}"'.format(data_dir)) + self.log.trace('Creating "%s"', data_dir) makedirs(data_dir) chmod(data_dir, 0o700) @@ -185,7 +205,6 @@ class ConfMan(object): # 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'): - 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)