Merge branch 'website-python-rewrite'

1 files changed, 24 insertions, 6 deletions

diff --git a/include/py/homekit/config/config.py b/include/py/homekit/config/config.py
index 5fe1ae8..fec92a6 100644
--- a/include/py/homekit/config/config.py
+++ b/include/py/homekit/config/config.py
@@ -41,6 +41,9 @@ class BaseConfigUnit(ABC):
         self._data = {}
         self._logger = logging.getLogger(self.__class__.__name__)
 
+    def __iter__(self):
+        return iter(self._data)
+
     def __getitem__(self, key):
         return self._data[key]
 
@@ -75,6 +78,15 @@ class BaseConfigUnit(ABC):
 
         raise KeyError(f'option {key} not found')
 
+    def values(self):
+        return self._data.values()
+
+    def keys(self):
+        return self._data.keys()
+
+    def items(self):
+        return self._data.items()
+
 
 class ConfigUnit(BaseConfigUnit):
     NAME = 'dumb'
@@ -123,10 +135,10 @@ class ConfigUnit(BaseConfigUnit):
         return None
 
     @classmethod
-    def _addr_schema(cls, required=False, **kwargs):
+    def _addr_schema(cls, required=False, only_ip=False, **kwargs):
         return {
             'type': 'addr',
-            'coerce': Addr.fromstring,
+            'coerce': Addr.fromstring if not only_ip else Addr.fromipstring,
             'required': required,
             **kwargs
         }
@@ -158,6 +170,7 @@ class ConfigUnit(BaseConfigUnit):
             pass
 
         v = MyValidator()
+        need_document = False
 
         if rst == RootSchemaType.DICT:
             normalized = v.validated({'document': self._data},
@@ -165,16 +178,21 @@ class ConfigUnit(BaseConfigUnit):
                                          'type': 'dict',
                                          'keysrules': {'type': 'string'},
                                          'valuesrules': schema
-                                     }})['document']
+                                     }})
+            need_document = True
         elif rst == RootSchemaType.LIST:
             v = MyValidator()
-            normalized = v.validated({'document': self._data}, {'document': schema})['document']
+            normalized = v.validated({'document': self._data}, {'document': schema})
+            need_document = True
         else:
             normalized = v.validated(self._data, schema)
 
         if not normalized:
             raise cerberus.DocumentError(f'validation failed: {v.errors}')
 
+        if need_document:
+            normalized = normalized['document']
+
         self._data = normalized
 
         try:
@@ -235,6 +253,8 @@ class TranslationUnit(BaseConfigUnit):
 
 class Translation:
     LANGUAGES = ('en', 'ru')
+    DEFAULT_LANGUAGE = 'ru'
+
     _langs: dict[str, TranslationUnit]
 
     def __init__(self, name: str):
@@ -278,9 +298,7 @@ class Config:
                 and not isinstance(name, bool) \
                 and issubclass(name, AppConfigUnit) or name == AppConfigUnit:
             self.app_name = name.NAME
-            print(self.app_config)
             self.app_config = name()
-            print(self.app_config)
             app_config = self.app_config
         else:
             self.app_name = name if isinstance(name, str) else None