From: Orakaro Date: Fri, 30 May 2014 17:32:31 +0000 (+0900) Subject: add filter X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d51b4107ae3b0ac00b207ff8c79a85ed20b819be;p=rainbowstream.git add filter --- diff --git a/rainbowstream/config.py b/rainbowstream/config.py index 4faf815..df12df0 100644 --- a/rainbowstream/config.py +++ b/rainbowstream/config.py @@ -7,10 +7,13 @@ SEARCH_MAX_RECORD = 5 # Default home tweet HOME_TWEET_NUM = 5 - # Stream Domain USER_DOMAIN = 'userstream.twitter.com' PUBLIC_DOMAIN = 'stream.twitter.com' SITE_DOMAIN = 'sitestream.twitter.com' # Actually called DOMAIN = USER_DOMAIN + +# Filter and Ignore list ex: ['@fat','@mdo'] +ONLY_LIST = [] +IGNORE_LIST = [] diff --git a/rainbowstream/interactive.py b/rainbowstream/interactive.py index abf45b7..b7fabbc 100644 --- a/rainbowstream/interactive.py +++ b/rainbowstream/interactive.py @@ -7,7 +7,8 @@ class RainbowCompleter(object): """ Init """ - self.options = sorted(options) + self.options = options + self.current_candidates = [] return def complete(self, text, state): @@ -16,25 +17,43 @@ class RainbowCompleter(object): """ response = None if state == 0: - if text: - self.matches = [s - for s in self.options - if s and s.startswith(text)] + origline = readline.get_line_buffer() + begin = readline.get_begidx() + end = readline.get_endidx() + being_completed = origline[begin:end] + words = origline.split() + + if not words: + self.current_candidates = sorted(self.options.keys()) else: - self.matches = self.options + try: + if begin == 0: + candidates = self.options.keys() + else: + first = words[0] + candidates = self.options[first] + + if being_completed: + self.current_candidates = [ w for w in candidates + if w.startswith(being_completed) ] + else: + self.current_candidates = candidates + + except (KeyError, IndexError), err: + self.current_candidates = [] try: - response = self.matches[state] + response = self.current_candidates[state] except IndexError: response = None return response -def init_interactive_shell(set): +def init_interactive_shell(d): """ Init the rainbow shell """ - readline.set_completer(RainbowCompleter(set).complete) + readline.set_completer(RainbowCompleter(d).complete) readline.parse_and_bind('set editing-mode vi') readline.parse_and_bind("set input-meta on") readline.parse_and_bind("set convert-meta off") diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index 1e50a0c..0bd1123 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -43,10 +43,11 @@ cmdset = [ ] -def draw(t, keyword=None): +def draw(t, keyword=None, fil=[], ig=[]): """ Draw the rainbow """ + # Retrieve tweet tid = t['id'] text = t['text'] @@ -57,6 +58,13 @@ def draw(t, keyword=None): date = date - datetime.timedelta(seconds=time.timezone) clock = date.strftime('%Y/%m/%d %H:%M:%S') + # Filter and ignore + screen_name = '@' + screen_name + if fil and screen_name not in fil: + return + if ig and screen_name in ig: + return + res = db.tweet_query(tid) if not res: db.store(tid) @@ -64,7 +72,7 @@ def draw(t, keyword=None): rid = res[0].rainbow_id # Format info - user = cycle_color(name) + grey(' ' + '@' + screen_name + ' ') + user = cycle_color(name) + grey(' ' + screen_name + ' ') meta = grey('[' + clock + '] [id=' + str(rid) + ']') tweet = text.split() # Highlight RT @@ -123,6 +131,14 @@ def parse_arguments(): '-tt', '--track-keywords', help='Search the stream for specific text.') + parser.add_argument( + '-fil', + '--filter', + help='Filter specific screen_name.') + parser.add_argument( + '-ig', + '--ignore', + help='Ignore specific screen_name.') return parser.parse_args() @@ -166,6 +182,21 @@ def switch(): try: target = g['stuff'].split()[0] + # Filter and ignore + args = parse_arguments() + try : + if g['stuff'].split()[-1] == '-f': + only = raw_input('Only nicks: ') + ignore = raw_input('Ignore nicks: ') + args.filter = only.split(',') + args.ignore = ignore.split(',') + elif g['stuff'].split()[-1] == '-d': + args.filter = ONLY_LIST + args.ignore = IGNORE_LIST + except: + printNicely(red('Sorry, wrong format.')) + return + # Public stream if target == 'public': keyword = g['stuff'].split()[1] @@ -173,13 +204,12 @@ def switch(): keyword = keyword[1:] # Kill old process os.kill(g['stream_pid'], signal.SIGKILL) - args = parse_arguments() args.track_keywords = keyword # Start new process p = Process( - target=stream, + target=stream, args=( - PUBLIC_DOMAIN, + PUBLIC_DOMAIN, args)) p.start() g['stream_pid'] = p.pid @@ -188,7 +218,6 @@ def switch(): elif target == 'mine': # Kill old process os.kill(g['stream_pid'], signal.SIGKILL) - args = parse_arguments() # Start new process p = Process( target=stream, @@ -198,7 +227,13 @@ def switch(): g['original_name'])) p.start() g['stream_pid'] = p.pid + printNicely('') printNicely(green('Stream switched.')) + if args.filter: + printNicely(cyan('Only: ' + str(args.filter))) + if args.ignore: + printNicely(red('Ignore: ' + str(args.ignore))) + printNicely('') except: printNicely(red('Sorry I can\'t understand.')) g['prefix'] = False @@ -346,6 +381,10 @@ def help(): You are already on your personal stream: "switch public #AKB" will switch to public stream and follow "AKB" keyword. "switch mine" will switch back to your personal stream. + "switch mine -f" will prompt to enter the filter. + "Only nicks" filter will decide nicks will be INCLUDE ONLY. + "Ignore nicks" filter will decide nicks will be EXCLUDE. + "switch mine -d" will use the config's ONLY_LIST and IGNORE_LIST(see config.py). For more action: "home" will show your timeline. "home 7" will show 7 tweet. "view @bob" will show your friend @bob's home. @@ -420,7 +459,25 @@ def listen(): """ Listen to user's input """ - init_interactive_shell(cmdset) + d = dict(zip( + cmdset, + [ + ['public #','mine'], # switch + [], # home + ['@'], # view + [], # tweet + [], # retweet + [], # reply + [], # delete + ['#'], # search + [], # friend + [], # follower + [], # help + [], # clear + [], # quit + ] + )) + init_interactive_shell(d) first = True while True: if g['prefix'] and not first: @@ -441,6 +498,7 @@ def stream(domain, args, name='Rainbow Stream'): """ Track the stream """ + # The Logo art_dict = { USER_DOMAIN: name, @@ -448,6 +506,7 @@ def stream(domain, args, name='Rainbow Stream'): SITE_DOMAIN: 'Site Stream', } ascii_art(art_dict[domain]) + # These arguments are optional: stream_args = dict( timeout=args.timeout, @@ -486,7 +545,7 @@ def stream(domain, args, name='Rainbow Stream'): elif tweet is Hangup: printNicely("-- Hangup --") elif tweet.get('text'): - draw(t=tweet, keyword=args.track_keywords) + draw(t=tweet, keyword=args.track_keywords, fil=args.filter, ig=args.ignore) def fly():