Merge pull request #56 from rediscovery-io/fix-load-config

Fix load config file

Author: vmanilo

remo/__init__.py

@@ -19,8 +19,8 @@ def connect(server: str = '', email: str = '', password: str = '', viewer: str =
     """
 
     if remo_home:
-        from .config import set_REMO_HOME
-        set_REMO_HOME(remo_home)
+        from .config import set_remo_home
+        set_remo_home(remo_home)
 
     if not (server and email and password):
         from .config import Config

remo/config.py

@@ -5,11 +5,11 @@
 REMO_HOME_ENV = 'REMO_HOME'
 
 
-def REMO_HOME():
+def get_remo_home():
     return os.getenv(REMO_HOME_ENV, str(Path.home().joinpath('.remo')))
 
 
-def set_REMO_HOME(path: str):
+def set_remo_home(path: str):
     if not os.path.exists(path):
         os.makedirs(path)
     os.environ[REMO_HOME_ENV] = path
@@ -38,9 +38,12 @@ def server_url(self):
         return '{}:{}'.format(self.server, self.port)
 
     @staticmethod
-    def load(config_path: str = str(os.path.join(REMO_HOME(), 'remo.json'))):
+    def load(config_path: str = None):
+        if not config_path:
+            config_path = str(os.path.join(get_remo_home(), 'remo.json'))
+
         if not os.path.exists(config_path):
-            return None
+            raise Exception(f'Config file not found, file {config_path} not exists')
 
         with open(config_path) as cfg_file:
             config = json.load(cfg_file)

remo/viewer.py

@@ -6,7 +6,7 @@
 import webbrowser
 import uuid
 
-from remo.config import REMO_HOME
+from remo.config import get_remo_home
 
 
 class AbstractViewer(metaclass=ABCMeta):
@@ -86,7 +86,7 @@ def build_cmd(executable, **kwargs):
         return '{} {}'.format(executable, ' '.join('--{}={}'.format(k, v) for k, v in kwargs.items() if v))
 
     def get_remo_path(self):
-        return str(os.path.join(REMO_HOME(), self.exe_path.get(platform.system())))
+        return str(os.path.join(get_remo_home(), self.exe_path.get(platform.system())))
 
 
 def factory(name: str):