X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=rainbowstream%2Fconfig.py;h=1573cce1f9a14ea184750469e577ae96ef72c412;hb=7cd92bc3eae7ff84fec3a60cb796ba3d46e1d4c9;hp=e6c0de2a9e882a26ba62102b2fdcaf1c79e8113b;hpb=9d5a2a1c86bffc0895754badbd48746f481cdad2;p=rainbowstream.git

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index e6c0de2..1573cce 100644
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -2,7 +2,6 @@ import json
 import re
 import os
 import os.path
-from io import open
 from collections import OrderedDict
 
 # Regular expression for comments in config file
@@ -43,26 +42,30 @@ def get_all_config():
     """
     Get all config
     """
-    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)
-    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):
@@ -83,15 +86,15 @@ def set_config(key, value):
         value = True
     elif value.lower() == 'false':
         value = False
-    # Fix up
+    # 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:
-        pass
-    # Update global config
-    c[key] = value
+        return
     # Update config file
     if key in data:
         fixup(data, key, value)
@@ -108,7 +111,10 @@ def delete_config(key):
     Delete a config key
     """
     path = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
-    data = load_config(path)
+    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)
@@ -129,13 +135,14 @@ def reload_config():
     """
     Reload config
     """
-    rainbow_config = os.path.expanduser("~") + 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():
@@ -143,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:
@@ -157,11 +164,11 @@ def init_config():
         data = load_config(rainbow_config)
         for d in data:
             c[d] = data[d]
-    except:
-        pass
+    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: