Changeset 40949 for branches/ipp-259_genericise_backups/tools/backups/utils/config_parse_helper.py

Timestamp:

Oct 18, 2019, 10:35:56 AM (7 years ago)

Author:

fairlamb

Message:

changed the structure so that a full schema must be given, also allowed a full schema to exist

File:

• branches/ipp-259_genericise_backups/tools/backups/utils/config_parse_helper.py (modified) (5 diffs)

branches/ipp-259_genericise_backups/tools/backups/utils/config_parse_helper.py

@@ -41 +41 @@
     def __init__(self, section_name, options: [ConfigSchemaLine]):
         self.section_name = section_name
+        self.options = {}
         self._process_options(options)
 
     def _process_options(self, options):
-        self.options = {}
         if options is None:
             return
         if type(options) is not list:
-            raise ValidationError("ValidationError: ConfigSchema options must be '[ConfigSchemaLine]' or 'None'")
+            raise ValidationError(f"ValidationError: {self.__class__.__name__} options must be '[ConfigSchemaLine]' or 'None'")
         if len(options) == 0:
             return
@@ -62 +62 @@
     def get_schema_line(self, key: str) -> ConfigSchemaLine:
         if not self.key_in_options(key):
-            raise KeyError(f"KeyError: '{key}' is not present in schema")
+            raise KeyError(f"KeyError: '{key}' is not present in schema section")
         return self.options[key]
 
     def __str__(self):
         options_strs = [ o.__str__() for o in self.options]
-        return (f'{self.__class__.__name__} with {options_strs}')
+        return (f'{self.__class__.__name__} named "{self.section_name}" with {options_strs}')
+
+
+class ConfigSchema():
+
+    def __init__(self, sections: [ConfigSchemaSection]):
+        self.sections = {}
+        self._process_sections(sections)
+
+    def _process_sections(self, sections):
+        if sections is None:
+            return
+        if type(sections) is not list:
+            raise ValidationError(f"ValidationError: {self.__class__.__name__} sections must be '[ConfigSchemaSection]' or 'None'")
+        if len(sections) == 0:
+            return
+        for sec in sections:
+            self.add_section(sec)
+
+    def add_section(self, section: ConfigSchemaSection):
+        self.sections[section.section_name] = section
+
+    def section_exists(self, section_name: str) -> bool:
+        return section_name in self.sections.keys()
+
+    def get_schema_section(self, section_name: str) -> ConfigSchemaSection:
+        if not self.section_exists(section_name):
+            raise KeyError(f"KeyError: '{section_name}' is not present in schema")
+        return self.sections[section_name]
+
+    def __str__(self):
+        section_strs = [ o.__str__() for o in self.sections]
+        return (f'{self.__class__.__name__} with {section_strs}')
 
 
@@ -76 +108 @@
 
 
-def parse_config(config: ConfigParser(), schema: ConfigSchemaSection) -> dict:
+def _parse_config_section(config: ConfigParser(), schema: ConfigSchemaSection) -> dict:
     """For a given config it will extract all values defined by the schema
 and return them as a dictionary of the keys and the assoicated value as the
@@ -87 +119 @@
         csl = schema.get_schema_line(csl_key)
 
+        # Parses each line
         if config.has_option(section, csl_key):
             if csl.expected_type is bool:
@@ -115 +148 @@
 
     return parsed_items
+
+
+# def parse_config(config: ConfigParser(), schema: ConfigSchemaSection) -> dict:
+#     return _parse_config_section(config, schema)
+
+def _parse_config(config: ConfigParser(), schema: ConfigSchema) -> dict:
+    parsed_items = {}
+    print(config)
+    for c in config:
+        print(c)
+
+    for css_name in schema.sections:
+        print(css_name)
+        css = schema.get_schema_section(css_name)
+        print(css)
+
+        # if config.has_section(css_name):
+        parsed_section = _parse_config_section(config, css)
+        parsed_items[css_name] = parsed_section
+        # else:
+        #     raise ConfigError(config, f"ConfigError: Expected section '{css_name}' from schema not present in config")
+
+    return parsed_items
+
+
+class ParsedConfig():
+
+    def __init__(self, config: ConfigParser, schema: ConfigSchema):
+        self._section_dict = _parse_config(config, schema)
+
+    def has_section(self, section_name):
+        return section_name in self._section_dict
+
+    def get_section(self, section_name):
+        if self.has_section(section_name):
+            return self._section_dict[section_name]
+        return None