[config] finished moving

bauh/view/core/config.py

@@ -12,67 +12,52 @@ from bauh.commons.config import read_config as read
 CONFIG_PATH = '{}/.config/{}'.format(Path.home(), __app_name__)
 FILE_PATH = '{}/config.yml'.format(CONFIG_PATH)
 
-# TODO stopped here
-class UpdatesSettings:
 
-    def __init__(self, check_interval: int, **kwargs):
-        self.check_interval = check_interval
-
-
-class CacheSettings:
-
-    def __init__(self, data_expiration: int, icon_expiration: int, **kwargs):
-        self.data_expiration = data_expiration
-        self.icon_expiration = icon_expiration
-
-
-class Configuration:
-
-    def __init__(self, gems: List[str], style: str, cache: dict, locale: str,
-                 updates: dict, system_notifications: bool, disk_cache: bool, download_icons: bool,
-                 check_packaging_once: bool, suggestions: bool, max_displayed: int, download_mthread: bool,
-                 **kwargs):
-        self.gems = gems
-        self.style = style
-        self.cache = CacheSettings(**cache)
-        self.locale = locale
-        self.updates = UpdatesSettings(**updates)
-        self.system_notifications = system_notifications
-        self.disk_cache = disk_cache
-        self.download_icons = download_icons
-        self.check_packaging_once = check_packaging_once
-        self.suggestions = suggestions
-        self.max_displayed = max_displayed
-        self.download_mthread = download_mthread
-
-
-def read_config(update_file: bool = False) -> Configuration:
+def read_config(update_file: bool = False) -> dict:
     default = {
         'gems': None,
-        'style': None,
-        'cache_exp': 60 * 60,
-        'icon_exp': 60 * 5,
+        'memory_cache': {
+            'data_expiration': 60 * 60,
+            'icon_expiration': 60 * 5
+        },
         'locale': None,
         'updates': {
-            'check_interval': 60
+            'check_interval': 30
         },
-        'system_notifications': True,
-        'disk_cache': True,
-        'download_icons': True,
-        'check_packaging_once': False,
-        'suggestions': True,
-        'max_displayed': 50,  # table
-        'download_mthread': True  # downloads
+        'system': {
+          'notifications': True,
+          'single_dependency_checking': False
+        },
+        'disk_cache': {
+            'enabled': True
+        },
+        'suggestions': {
+            'enabled': True,
+            'by_type': 10
+        },
+        'ui': {
+            'table': {
+                'max_displayed': 50
+            },
+            'tray': {
+                'default_icon': None,
+                'updates_icon': None
+            },
+            'style': None
+        },
+        'download': {
+            'multithreaded': True,
+            'icons': True
+        }
     }
-    obj = read(FILE_PATH, default, update_file=update_file, update_async=True)
-    return Configuration(**obj)
+    return read(FILE_PATH, default, update_file=update_file, update_async=True)
 
 
-def save(config: Configuration):
+def save(config: dict):
     Path(CONFIG_PATH).mkdir(parents=True, exist_ok=True)
 
     with open(FILE_PATH, 'w+') as f:
-        f.write(yaml.safe_dump(config.__dict__))
+        f.write(yaml.safe_dump(config))
 
 
 def remove_old_config(logger: logging.Logger):