projects
/
rainbowstream.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document
[rainbowstream.git]
/
rainbowstream
/
rainbow.py
diff --git
a/rainbowstream/rainbow.py
b/rainbowstream/rainbow.py
index d31533b029f6dbfe579a71cd0f024e8a24e55e5d..6b88c501c8dcd109c7ac000516f62f6751c91c97 100644
(file)
--- a/
rainbowstream/rainbow.py
+++ b/
rainbowstream/rainbow.py
@@
-780,7
+780,7
@@
def theme():
os.environ.get('USERPROFILE',
'')) + os.sep + '.rainbow_config.json'
if not os.path.exists(custom_path):
os.environ.get('USERPROFILE',
'')) + os.sep + '.rainbow_config.json'
if not os.path.exists(custom_path):
- line += light_magenta(' (create your own config at ~/.rainbow_config.json)')
+ line += light_magenta(' (create your own config
file
at ~/.rainbow_config.json)')
else:
line += light_magenta(' (loaded)')
else:
else:
line += light_magenta(' (loaded)')
else:
@@
-794,20
+794,30
@@
def theme():
# Change theme
try:
# Load new config
# Change theme
try:
# Load new config
- new_config = 'rainbowstream/colorset/' + g['stuff'] + '.json'
+ if g['stuff'] != 'custom':
+ new_config = 'rainbowstream/colorset/' + g['stuff'] + '.json'
+ else:
+ new_config = os.environ.get(
+ 'HOME',os.environ.get(
+ 'USERPROFILE',
+ '')) + os.sep + '.rainbow_config.json'
new_config = load_config(new_config)
if new_config:
for nc in new_config:
c[nc] = new_config[nc]
# Update db and reset colors
db.theme_update(g['stuff'])
new_config = load_config(new_config)
if new_config:
for nc in new_config:
c[nc] = new_config[nc]
# Update db and reset colors
db.theme_update(g['stuff'])
- cyc = init_cycle()
+ c['theme'] = g['stuff']
+ notify_cycle()
g['decorated_name'] = color_func(
c['DECORATED_NAME'])(
'[@' + g['original_name'] + ']: ')
printNicely(green('Theme changed.'))
except:
g['decorated_name'] = color_func(
c['DECORATED_NAME'])(
'[@' + g['original_name'] + ']: ')
printNicely(green('Theme changed.'))
except:
- printNicely(red('Sorry, can not load config file!'))
+ if g['stuff'] == 'custom':
+ printNicely(red('~/.rainbow_config.json is not exists!'))
+ else:
+ printNicely(red('No such theme exists.'))
def help():
def help():