merge with built mute dict

diff --git a/docs/conf.py b/docs/conf.py
index 0d7fd1d3fda2fd573d95ceeea7941c9eebc768a7..33c43e7f7db13010a622b6b1110a25fb64240c98 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.4'
+version = '0.6.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.4'
+release = '0.6.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index e468c9c1d5725625133355d1af816ce99e426838..c2f2d5cd9ddba696a49e2f6bfe25c1155dbbd85a 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -147,8 +147,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:
@@ -164,8 +164,8 @@ def init_config():
     except 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:

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index d9afe06c3ec2ed0366e209761dbb109f35aa53de..5dd078807b32946e40db1d561b123c51e693d4ef 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -207,6 +207,8 @@ def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]):
 
     # Filter and ignore
     screen_name = '@' + screen_name
+    fil = list(set((fil or []) + c['ONLY_LIST']))
+    ig = list(set((ig or []) + c['IGNORE_LIST']))
     if fil and screen_name not in fil:
         return
     if ig and screen_name in ig:

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index adfbff281ebe64f1bb52b1b6fa7aa792cfddba48..616465eb5e7be241d97e621833dfc40da14206c7 100644 (file)
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -23,6 +23,9 @@ unescape = HTMLParser().unescape
 # raw_input and map function behaviour
 if sys.version[0] == "2":
     lmap = lambda f, a: map(f, a)
+    unc = lambda x: x.decode('utf-8')
 else:
     raw_input = input
     lmap = lambda f, a: list(map(f, a))
+    unc = lambda x: x
+

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 598d367b70dafdea73be36b1eae16555f3080c08..d2caee3ac2a2a67de3faaaf41b943ff4e6e8970f 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -137,6 +137,33 @@ def authen():
         CONSUMER_SECRET)
 
 
+def build_mute_dict(dict_data=False):
+    """
+    Build muting list
+    """
+    t = Twitter(auth=authen())
+    # Init cursor
+    next_cursor = -1
+    screen_name_list = []
+    name_list = []
+    # Cursor loop
+    while next_cursor != 0:
+        list = t.mutes.users.list(
+            screen_name=g['original_name'],
+            cursor=next_cursor,
+            skip_status=True,
+            include_entities=False,
+        )
+        screen_name_list += ['@' + u['screen_name'] for u in list['users']]
+        name_list += [u['name'] for u in list['users']]
+        next_cursor = list['next_cursor']
+    # Return dict or list
+    if dict_data:
+        return dict(zip(screen_name_list, name_list))
+    else:
+        return screen_name_list
+
+
 def init(args):
     """
     Init function
@@ -167,6 +194,8 @@ def init(args):
     # 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()
 
 
 def switch():
@@ -416,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)
 
 
@@ -711,11 +740,16 @@ def mute():
         printNicely(red('A name should be specified. '))
         return
     if screen_name.startswith('@'):
-        rel = t.mutes.users.create(screen_name=screen_name[1:])
-        if isinstance(rel, dict):
-            printNicely(green(screen_name + ' is muted.'))
-        else:
-            printNicely(red(rel))
+        try:
+            rel = t.mutes.users.create(screen_name=screen_name[1:])
+            if isinstance(rel, dict):
+                printNicely(green(screen_name + ' is muted.'))
+                c['IGNORE_LIST'] += [unc(screen_name)]
+                c['IGNORE_LIST'] = list(set(c['IGNORE_LIST']))
+            else:
+                printNicely(red(rel))
+        except:
+            printNicely(red('Something is wrong, can not mute now :('))
     else:
         printNicely(red('A name should begin with a \'@\''))
 
@@ -731,11 +765,15 @@ def unmute():
         printNicely(red('A name should be specified. '))
         return
     if screen_name.startswith('@'):
-        rel = t.mutes.users.destroy(screen_name=screen_name[1:])
-        if isinstance(rel, dict):
-            printNicely(green(screen_name + ' is unmuted.'))
-        else:
-            printNicely(red(rel))
+        try:
+            rel = t.mutes.users.destroy(screen_name=screen_name[1:])
+            if isinstance(rel, dict):
+                printNicely(green(screen_name + ' is unmuted.'))
+                c['IGNORE_LIST'].remove(screen_name)
+            else:
+                printNicely(red(rel))
+        except:
+            printNicely(red('Maybe you are not muting this person ?'))
     else:
         printNicely(red('A name should begin with a \'@\''))
 
@@ -744,27 +782,15 @@ def muting():
     """
     List muting user
     """
-    t = Twitter(auth=authen())
-    # Init cursor
-    next_cursor = -1
-    rel = {}
-    # Cursor loop
-    while next_cursor != 0:
-        list = t.mutes.users.list(
-            screen_name=g['original_name'],
-            cursor=next_cursor,
-            skip_status=True,
-            include_entities=False,
-        )
-        for u in list['users']:
-            rel[u['name']] = '@' + u['screen_name']
-        next_cursor = list['next_cursor']
-    # Print out result
-    printNicely('All: ' + str(len(rel)) + ' people.')
-    for name in rel:
-        user = '  ' + cycle_color(name)
-        user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ')
+    # Get dict of muting users
+    md = build_mute_dict(dict_data=True)
+    printNicely('All: ' + str(len(md)) + ' people.')
+    for name in md:
+        user = '  ' + cycle_color(md[name])
+        user += color_func(c['TWEET']['nick'])(' ' + name + ' ')
         printNicely(user)
+    # Update from Twitter
+    c['IGNORE_LIST'] = [n for n in md]
 
 
 def block():
@@ -1051,7 +1077,7 @@ def list_delete(t):
         printNicely(red('Oops something is wrong with Twitter :('))
 
 
-def list():
+def twitterlist():
     """
     Twitter's list
     """
@@ -1536,7 +1562,7 @@ def process(cmd):
             block,
             unblock,
             report,
-            list,
+            twitterlist,
             cal,
             config,
             theme,
@@ -1664,7 +1690,7 @@ def stream(domain, args, name='Rainbow Stream'):
         ascii_art(art_dict[domain])
     # These arguments are optional:
     stream_args = dict(
-        timeout=0.5, # To check g['stream_stop'] after each 0.5 s
+        timeout=0.5,  # To check g['stream_stop'] after each 0.5 s
         block=not args.no_block,
         heartbeat_timeout=args.heartbeat_timeout)
     # Track keyword
@@ -1740,7 +1766,7 @@ def fly():
     except TwitterHTTPError:
         printNicely('')
         printNicely(
-            magenta("We have maximum connection problem with twitter'stream API right now :("))
+            magenta("We have connection problem with twitter'stream API right now :("))
         printNicely(magenta("Let's try again later."))
         save_history()
         sys.exit()

diff --git a/setup.py b/setup.py
index d95c41177ee7ef83cb6ccc8335efa95283e90182..636e6aae18c5ba84e02ae953eaf941465c767921 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '0.6.4'
+version = '0.6.7'
 
 # Require
 install_requires = [