remove default theme, add retweet count and favorites count

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 95461788e9961cce9375639fe623f30a04132e7a..f456a8467dddf6db8708595d9176422fd77e414f 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -178,8 +178,7 @@ def init(args):
         set_config('PREFIX', name)
     g['original_name'] = name[1:]
     g['decorated_name'] = lambda x: color_func(
-        c['DECORATED_NAME'])(
-        '[' + x + ']: ')
+        c['DECORATED_NAME'])('[' + x + ']: ')
     # Theme init
     files = os.listdir(os.path.dirname(__file__) + '/colorset')
     themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json']
@@ -194,6 +193,7 @@ def init(args):
     c['message_dict'] = []
     # Image on term
     c['IMAGE_ON_TERM'] = args.image_on_term
+    set_config('IMAGE_ON_TERM', str(c['IMAGE_ON_TERM']))
     # Mute dict
     c['IGNORE_LIST'] += build_mute_dict()
 
@@ -445,7 +445,7 @@ def reply():
     tid = c['tweet_dict'][id]
     user = t.statuses.show(id=tid)['user']['screen_name']
     status = ' '.join(g['stuff'].split()[1:])
-    status = '@' + user + ' ' + status.decode('utf-8')
+    status = '@' + user + ' ' + unc(status)
     t.statuses.update(status=status, in_reply_to_status_id=tid)
 
 
@@ -744,7 +744,7 @@ def mute():
             rel = t.mutes.users.create(screen_name=screen_name[1:])
             if isinstance(rel, dict):
                 printNicely(green(screen_name + ' is muted.'))
-                c['IGNORE_LIST'] += [screen_name.decode('utf8')]
+                c['IGNORE_LIST'] += [unc(screen_name)]
                 c['IGNORE_LIST'] = list(set(c['IGNORE_LIST']))
             else:
                 printNicely(red(rel))
@@ -1151,17 +1151,16 @@ def config():
             value = get_default_config(key)
             line = ' ' * 2 + green(key) + ': ' + light_magenta(value)
             printNicely(line)
-        except:
-            printNicely(
-                light_magenta('This config key does not exist in default.'))
+        except Exception as e:
+            printNicely(red(e))
     # Delete specific config key in config file
     elif len(g['stuff'].split()) == 2 and g['stuff'].split()[-1] == 'drop':
         key = g['stuff'].split()[0]
         try:
             delete_config(key)
             printNicely(green('Config key is dropped.'))
-        except:
-            printNicely(red('No such config key.'))
+        except Exception as e:
+            printNicely(red(e))
     # Set specific config
     elif len(g['stuff'].split()) == 3 and g['stuff'].split()[1] == '=':
         key = g['stuff'].split()[0]
@@ -1175,13 +1174,11 @@ def config():
             if key == 'THEME':
                 c['THEME'] = reload_theme(value, c['THEME'])
                 g['decorated_name'] = lambda x: color_func(
-                    c['DECORATED_NAME'])(
-                    '[' + x + ']: ')
+                    c['DECORATED_NAME'])('[' + x + ']: ')
+            reload_config()
             printNicely(green('Updated successfully.'))
-        except:
-            printNicely(light_magenta('Not valid value.'))
-            return
-        reload_config()
+        except Exception as e:
+            printNicely(red(e))
     else:
         printNicely(light_magenta('Sorry I can\'s understand.'))
 
@@ -1209,7 +1206,8 @@ def theme():
                 c['DECORATED_NAME'])(
                 '[' + x + ']: ')
             printNicely(green('Theme changed.'))
-        except:
+        except Exception as e:
+            print(e)
             printNicely(red('No such theme exists.'))
 
 
@@ -1516,6 +1514,10 @@ def reset():
     Reset prefix of line
     """
     if g['reset']:
+        if c.get('USER_JSON_ERROR'):
+            printNicely(red('Your ~/.rainbow_config.json is messed up:'))
+            printNicely(red('>>> ' + c['USER_JSON_ERROR']))
+            printNicely('')
         printNicely(magenta('Need tips ? Type "h" and hit Enter key!'))
     g['reset'] = False
     try:
@@ -1741,7 +1743,7 @@ def stream(domain, args, name='Rainbow Stream'):
                 # the 1st character of that word
                 if current_buffer and g['previous_cmd'] != current_buffer:
                     sys.stdout.write(
-                        g['decorated_name'](c['PREFIX']) + current_buffer)
+                        g['decorated_name'](c['PREFIX']) + unc(current_buffer))
                     sys.stdout.flush()
                 elif not c['HIDE_PROMPT']:
                     sys.stdout.write(g['decorated_name'](c['PREFIX']))