Bumped version 1.5.2

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 4645409f9633e09b40d3e15fb985866ac1f3d60f..f97b2099740da2a5dc22ee26e2cf50254509dbed 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -6,13 +6,21 @@ from collections import OrderedDict
 
 # Regular expression for comments in config file
 comment_re = re.compile(
-    '(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
+    '(^)[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
     re.DOTALL | re.MULTILINE
 )
 
 # Config dictionary
 c = {}
 
+def user_filepath():
+    """
+    Determine the user's config file location
+    """
+    if 'RAINBOW_CONFIG' in os.environ:
+        return os.environ['RAINBOW_CONFIG']
+
+    return os.path.expanduser("~") + os.sep + '.rainbow_config.json'
 
 def fixup(adict, k, v):
     """
@@ -42,26 +50,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 = user_filepath()
+        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'
-    data = load_config(path)
-    return data[key]
+    try:
+        path = os.path.dirname(__file__) + '/colorset/config'
+        data = load_config(path)
+        return data[key]
+    except:
+        raise Exception('This config key does not exist in default.')
 
 
 def get_config(key):
@@ -78,18 +90,49 @@ def set_config(key, value):
     # Modify value
     if value.isdigit():
         value = int(value)
-    elif value.lower() == 'True':
+    elif value.lower() == 'true':
         value = True
-    elif value.lower() == 'False':
+    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)
-    fixup(data, key, value)
+    # Update global config
+    c[key] = value
+    # Load current user config
+    path = user_filepath()
+    data = {}
+    try:
+        data = load_config(path)
+    except:
+        return
+    # Update config file
+    if key in data:
+        fixup(data, key, value)
+    else:
+        data[key] = value
+    # Save
+    with open(path, 'w') as out:
+        json.dump(data, out, indent=4)
+    os.system('chmod 777 ' + path)
+
+
+def delete_config(key):
+    """
+    Delete a config key
+    """
+    path = user_filepath()
+    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)
+        c.pop(key)
+        try:
+            data[key] = c[key] = get_default_config(key)
+        except:
+            pass
+    else:
+        raise Exception('No such config key.')
     # Save
     with open(path, 'w') as out:
         json.dump(data, out, indent=4)
@@ -100,17 +143,13 @@ def reload_config():
     """
     Reload config
     """
-    rainbow_config = os.environ.get(
-        'HOME',
-        os.environ.get(
-            'USERPROFILE',
-            '')) + os.sep + '.rainbow_config.json'
     try:
+        rainbow_config = user_filepath()
         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():
@@ -118,8 +157,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:
@@ -127,20 +166,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 = user_filepath()
     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:
@@ -150,4 +185,4 @@ def init_config():
 
 
 # Init config
-init_config()
\ No newline at end of file
+init_config()