From 24e75f7ed0a8efeea4534a0e7c04047624ace876 Mon Sep 17 00:00:00 2001
From: Artem30801 <artem30801@gmail.com>
Date: Sun, 5 Jan 2020 22:58:07 +0300
Subject: [PATCH] config error repr + improved comment loading

---
 Drone/client.py |  4 +++-
 config.py       | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Drone/client.py b/Drone/client.py
index 236c098..53d50fa 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -52,6 +52,8 @@ class Client(object):
         elif config_id == '/ip':
             self.client_id = messaging.get_ip_address()
 
+        logger.info("Config loaded")
+
     @staticmethod
     def get_ntp_time(ntp_host, ntp_port):
         NTP_PACKET_FORMAT = "!12I"
@@ -199,7 +201,6 @@ class Client(object):
 
 @messaging.message_callback("config")
 def _command_config_write(*args, **kwargs):
-    print(kwargs)
     mode = kwargs.get("mode", "modify")
     # exceptions would be risen in case of incorrect config
     if mode == "rewrite":
@@ -211,6 +212,7 @@ def _command_config_write(*args, **kwargs):
 
     active_client.config.write()
     active_client.load_config()
+    logger.info("Config successfully updated from command")
 
 
 @messaging.request_callback("id")
diff --git a/config.py b/config.py
index e091717..c798678 100644
--- a/config.py
+++ b/config.py
@@ -29,6 +29,9 @@ class ValidationError(ValueError):
         self.config = config
         self.errors = errors
 
+    def __str__(self):
+        return "{} - {}".format(self.args[0], " ".join(self.flatten_errors()))
+
     def flatten_errors(self):
         for entry in flatten_errors(self.config, self.errors):
             section_list, key, error = entry
@@ -68,7 +71,7 @@ class ConfigManager:
 
         test = config.validate(vdt, copy=copy_defaults, preserve_errors=True)
         if test != True:  # Important syntax, do no change
-            raise ValidationError('Some config values are wrong: {}'.format(test), config, test)
+            raise ValidationError('Some config values are wrong', config, test)
 
         self.config = config
         self.validated = True
@@ -91,8 +94,8 @@ class ConfigManager:
                           'value': value,
                           'default': default_values.get(key, None),
                           'unchanged': key in defaults,
-                          'comments': comments[key],
-                          'inline_comment': inline_comments[key],
+                          'comments': comments.get(key, []),
+                          'inline_comment': inline_comments.get(key, None),
                           }
                 data[key] = item_d
 
@@ -207,8 +210,8 @@ class ConfigManager:
 
     @classmethod
     def _load_comments(cls, d, section):
-        comments = {}
-        inline_comments = {}
+        comments = section.comments
+        inline_comments = section.inline_comments
 
         for key, val in d.items():
             if not isinstance(val, dict):  # Pure dict option
@@ -283,7 +286,8 @@ if __name__ == '__main__':
     import pprint
     pprint.pprint(cfg.full_dict)
     cfg2 = ConfigManager()
-    cfg2.load_from_dict({"PRIVATE": {"id": 123132}})
+    cfg2.load_from_dict({"PRIVATE": {"offset": [1, 2, 3]}}, path='Drone/config/spec/configspec_client.ini')
+    #cfg2.load_from_dict({"PRIVATE": {"id": 123132}})
     pprint.pprint(cfg2.full_dict)
     cfg.merge(cfg2)
     pprint.pprint(cfg.full_dict)