From bd1f4de3d2da96159f2b12dede991639ad7ac97e Mon Sep 17 00:00:00 2001
From: Volodymyr Manilo <wmanilo@gmail.com>
Date: Wed, 19 Aug 2020 15:04:37 +0300
Subject: [PATCH] Fix load config

---
 remo/config.py  | 34 ++++++++++++++++++++++++++--------
 remo/version.py |  2 +-
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/remo/config.py b/remo/config.py
index 5d4dd01..326bb77 100644
--- a/remo/config.py
+++ b/remo/config.py
@@ -26,6 +26,16 @@ def set_remo_home_from_default_remo_config() -> bool:
             return True
 
 
+class ViewerOptions:
+    electron = 'electron'
+    browser = 'browser'
+    jupyter = 'jupyter'
+
+
+class CloudPlatformOptions:
+    colab = 'colab'
+
+
 class Config:
     """
     Remo Config
@@ -47,16 +57,11 @@ class Config:
         'remo_home',
         'cloud_platform',
     ]
-    _default_port = 8123
-    _default_server = 'http://localhost'
-    _default_user_name = 'Admin User'
-    _default_user_email = 'admin@remo.ai'
-    _default_user_password = 'adminpass'
-    _default_viewer = 'browser'
 
     def __init__(self, config):
         for name in self.__slots__:
-            setattr(self, name, config.get(name, getattr(self, '_default_{}'.format(name))))
+            default_value = getattr(DefaultConfig, name)
+            setattr(self, name, config.get(name, default_value))
 
     def server_url(self):
         return '{}:{}'.format(self.server, self.port)
@@ -82,4 +87,17 @@ def default_path():
     def path(dir_path: str = None):
         if not dir_path:
             dir_path = get_remo_home()
-        return str(os.path.join(dir_path, Config.name))
\ No newline at end of file
+        return str(os.path.join(dir_path, Config.name))
+
+
+class DefaultConfig(Config):
+    port = 8123
+    server = 'http://localhost'
+    user_name = 'Admin User'
+    user_email = 'admin@remo.ai'
+    user_password = 'adminpass'
+    viewer = ViewerOptions.browser
+    uuid = 'undefined'
+    public_url = None
+    remo_home = None
+    cloud_platform = None
diff --git a/remo/version.py b/remo/version.py
index c3bb296..1c98a23 100644
--- a/remo/version.py
+++ b/remo/version.py
@@ -1 +1 @@
-__version__ = '0.1.8'
+__version__ = '0.1.9'