projects
/
rainbowstream.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix serious bug with CPU 100%
[rainbowstream.git]
/
rainbowstream
/
config.py
diff --git
a/rainbowstream/config.py
b/rainbowstream/config.py
index 1245ca456371d6a9de4d8f0944d7368c6be6da5d..2a11d3bdc9ea36c23d64d172ef4c73d2f910a28f 100644
(file)
--- a/
rainbowstream/config.py
+++ b/
rainbowstream/config.py
@@
-42,15
+42,12
@@
def get_all_config():
"""
Get all config
"""
"""
Get all config
"""
- path = os.environ.get(
- 'HOME',
- os.environ.get(
- 'USERPROFILE',
- '')) + os.sep + '.rainbow_config.json'
+ 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 = load_config(path)
# Hard to set from prompt
data.pop('ONLY_LIST', None)
data.pop('IGNORE_LIST', None)
+ data.pop('FORMAT', None)
return data
return data
@@
-86,12
+83,12
@@
def set_config(key, value):
elif value.lower() == 'false':
value = False
# Fix up
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)
+ path = os.
path.expanduser("~") + os.sep + '.rainbow_config.json'
+ data = {}
+ try:
+ data = load_config(path)
+ except:
+ pass
# Update global config
c[key] = value
# Update config file
# Update global config
c[key] = value
# Update config file
@@
-109,11
+106,7
@@
def delete_config(key):
"""
Delete a config key
"""
"""
Delete a config key
"""
- path = os.environ.get(
- 'HOME',
- os.environ.get(
- 'USERPROFILE',
- '')) + os.sep + '.rainbow_config.json'
+ path = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
data = load_config(path)
# Drop key
if key in data and key in c:
data = load_config(path)
# Drop key
if key in data and key in c:
@@
-135,11
+128,7
@@
def reload_config():
"""
Reload config
"""
"""
Reload 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:
try:
data = load_config(rainbow_config)
for d in data:
@@
-162,17
+151,13
@@
def init_config():
except:
pass
# Load user's 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:
try:
data = load_config(rainbow_config)
for d in data:
c[d] = data[d]
except:
- p
rint('It seems that ~/.rainbow_config.json has wrong format :(')
+ p
ass
# Load default theme
theme_file = os.path.dirname(
__file__) + '/colorset/' + c['THEME'] + '.json'
# Load default theme
theme_file = os.path.dirname(
__file__) + '/colorset/' + c['THEME'] + '.json'