Minor change added to make it more like how it was before

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 1245ca456371d6a9de4d8f0944d7368c6be6da5d..1573cce1f9a14ea184750469e577ae96ef72c412 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -42,29 +42,30 @@ def get_all_config():
     """
     Get all config
     """
-    path = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
-    data = load_config(path)
-    # Hard to set from prompt
-    data.pop('ONLY_LIST', None)
-    data.pop('IGNORE_LIST', None)
-    return data
+    try:
+        path = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
+        data = load_config(path)
+        # Hard to set from prompt
+        data.pop('ONLY_LIST', None)
+        data.pop('IGNORE_LIST', None)
+        data.pop('FORMAT', None)
+        data.pop('QUOTE_FORMAT', None)
+        data.pop('NOTIFY_FORMAT', None)
+        return data
+    except:
+        return []
 
 
 def get_default_config(key):
     """
     Get default value of a config key
     """
-    path = os.path.dirname(
-        __file__) + '/colorset/config'
     try:
+        path = os.path.dirname(__file__) + '/colorset/config'
         data = load_config(path)
+        return data[key]
     except:
-        raise Exception('No such config key.')
-    return data[key]
+        raise Exception('This config key does not exist in default.')
 
 
 def get_config(key):
@@ -85,15 +86,15 @@ def set_config(key, value):
         value = True
     elif value.lower() == 'false':
         value = False
-    # Fix up
-    path = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
-    data = load_config(path)
     # Update global config
     c[key] = value
+    # Load current user config
+    path = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
+    data = {}
+    try:
+        data = load_config(path)
+    except:
+        return
     # Update config file
     if key in data:
         fixup(data, key, value)
@@ -109,12 +110,11 @@ def delete_config(key):
     """
     Delete a config key
     """
-    path = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
-    data = load_config(path)
+    path = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
+    try:
+        data = load_config(path)
+    except:
+        raise Exception('Config file is messed up.')
     # Drop key
     if key in data and key in c:
         data.pop(key)
@@ -135,17 +135,14 @@ def reload_config():
     """
     Reload config
     """
-    rainbow_config = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
     try:
+        rainbow_config = os.path.expanduser("~") + \
+            os.sep + '.rainbow_config.json'
         data = load_config(rainbow_config)
         for d in data:
             c[d] = data[d]
     except:
-        print('It seems that ~/.rainbow_config.json has wrong format :(')
+        raise Exception('Can not reload config file with wrong format.')
 
 
 def init_config():
@@ -153,8 +150,8 @@ def init_config():
     Init configuration
     """
     # Load the initial config
-    config = os.path.dirname(
-        __file__) + '/colorset/config'
+    config = os.path.dirname(__file__) + \
+        '/colorset/config'
     try:
         data = load_config(config)
         for d in data:
@@ -162,20 +159,16 @@ def init_config():
     except:
         pass
     # Load user's config
-    rainbow_config = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
+    rainbow_config = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
     try:
         data = load_config(rainbow_config)
         for d in data:
             c[d] = data[d]
-    except:
-        print('It seems that ~/.rainbow_config.json has wrong format :(')
+    except (IOError, ValueError) as e:
+        c['USER_JSON_ERROR'] = str(e)
     # Load default theme
-    theme_file = os.path.dirname(
-        __file__) + '/colorset/' + c['THEME'] + '.json'
+    theme_file = os.path.dirname(__file__) + \
+        '/colorset/' + c['THEME'] + '.json'
     try:
         data = load_config(theme_file)
         for d in data: