Exporting/loading to/from dict

config.py

@@ -1,6 +1,5 @@
 import os
 
-from functools import partial
 from configobj import ConfigObj, Section
 from validate import Validator
 
@@ -13,18 +12,68 @@ def modify_filename(path, pattern):
 
 
 class ConfigManager:
-    def __init__(self):
-        self.config = ConfigObj()
+    def __init__(self, config=None):
+        self.config = ConfigObj() if config is None else config
 
-    def load_config(self, path):
+    def set_config(self, config):
+        self.config = config
+
+    @classmethod
+    def _extract_values(cls, d):
+        result = {}
+        for key, val in d.items():
+            if isinstance(val, dict) and val.get('__option__', False):
+                if not val.get('unchanged'):
+                    result[key] = val.get('value')
+            else:
+                result[key] = cls._extract_values(val)
+        return result
+
+    @classmethod
+    def _load_comments(cls, d, section):
+        comments = {}
+        inline_comments = {}
+
+        for key, val in d.items():
+            if val.get('__option__', False):
+                comments[key] = val.get('comments', [])
+                inline_comments[key] = val.get('inline_comment', '')
+            else:
+                cls._load_comments(val, section[key])
+                comments[key] = ['']
+                inline_comments[key] = None
+
+        section.comments = comments
+        section.inline_comments = inline_comments
+
+    def load_from_dict(self, d, path):
+        initial_comment = d.pop('initial_comment', [''])
+        final_comment = d.pop('final_comment', [''])
+
+        config = ConfigObj(infile=self._extract_values(d), indent_type='',
+                           configspec=modify_filename(path, 'spec/configspec_{}.ini'))
+        self._load_validate(config)
+        self.config.filename = path
+        self.config.initial_comment = initial_comment
+        self.config.final_comment = final_comment
+
+        self._load_comments(d, self.config)
+
+    def load_from_file(self, path):
         self.generate_default_config(path)
 
-        vdt = Validator()
         config = ConfigObj(infile=path, raise_errors=True,
                            configspec=modify_filename(path, 'spec/configspec_{}.ini'))
+
+        self._load_validate(config)
+
+    def _load_validate(self, config):
+        vdt = Validator()
+
         test = config.validate(vdt)
-        print(test)
-        print(config)
+        if test != True:  # Important syntax, do no change
+            raise ValueError('Some values are wrong: {}'.format(test))
+
         self.config = config
 
     def get(self, section, option):
@@ -56,6 +105,34 @@ class ConfigManager:
 
             return defaults if defaults else None
 
+    @classmethod
+    def _full_dict(cls, item):
+        if not isinstance(item, Section):
+            return item
+
+        d = {}
+        default_values = item.default_values
+        defaults = item.defaults
+        comments = item.comments
+        inline_comments = item.inline_comments
+
+        for key, value in item.items():
+            result = cls._full_dict(value)
+            if not isinstance(result, dict):
+                item_d = {'__option__': True,
+                          'value': value,
+                          'default': default_values[key],
+                          'unchanged': key in defaults,
+                          'comments': comments[key],
+                          'inline_comment': inline_comments[key],
+                          }
+                d[key] = item_d
+
+            else:
+                d[key] = result
+
+        return d
+
     @property
     def default_values(self):
         return self._get_defaults(self.config) or {}
@@ -64,6 +141,13 @@ class ConfigManager:
     def unchanged_defaults(self):
         return self._get_defaults(self.config, unchanged_only=True) or {}
 
+    @property
+    def full_dict(self):
+        d = self._full_dict(self.config)
+        d['initial_comment'] = self.config.initial_comment
+        d['final_comment'] = self.config.final_comment
+        return d
+
     @staticmethod
     def generate_default_config(path):
         if os.path.isfile(path):
@@ -94,16 +178,25 @@ class ConfigManager:
 
 if __name__ == '__main__':
     cfg = ConfigManager()
-    cfg.load_config('Drone/config/client.ini')
-
-    print(cfg.server_host)
+    cfg.load_from_file('Drone/config/client.ini')
+    #print(cfg.config.comments)
+    #print(cfg.server_host)
     cfg.server_host = '192.168.1.103'
 
-    print(cfg.get('SERVER', 'host'))
+    #print(cfg.get('SERVER', 'host'))
     cfg.set('SERVER', 'host', '192.168.1.103')
 
-    print(cfg.config)
-    print(cfg.default_values)
-    print(cfg.unchanged_defaults)
-    #print(cfg.con)
+    print(cfg.config.initial_comment, cfg.config.final_comment)
+
+    # print(cfg.config)
+    # print(cfg.default_values)
+    # print(cfg.unchanged_defaults)
+
+    # print(11111)
+    print(cfg.full_dict)
+
+    #cfg.load_from_dict(cfg.full_dict, 'Drone/config/client.ini')
+    #print(cfg.config.initial_comment, cfg.config.final_comment)
+    #cfg.write()
+