X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fdraw.py;h=11fa0000fb2fbf06e929a72d160fc1ea5ebd8758;hp=5dd078807b32946e40db1d561b123c51e693d4ef;hb=b80f059ad8d12bd4f5d0665db06974f0f610606a;hpb=9c37209ba97ff291a21cd7d936988c8d5b5fc1d2 diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py index 5dd0788..11fa000 100644 --- a/rainbowstream/draw.py +++ b/rainbowstream/draw.py @@ -3,6 +3,8 @@ import itertools import requests import datetime import time +import locale +import arrow import re from twitter.util import printNicely @@ -143,7 +145,7 @@ def color_func(func_name): return globals()[func_name] -def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): +def draw(t, keyword=None, humanize=True, check_semaphore=False, fil=[], ig=[]): """ Draw the rainbow """ @@ -165,14 +167,19 @@ def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): name = t['user']['name'] created_at = t['created_at'] favorited = t['favorited'] + retweet_count = t['retweet_count'] + favorite_count = t['favorite_count'] date = parser.parse(created_at) - date = date - datetime.timedelta(seconds=time.timezone) - clock_format = '%Y/%m/%d %H:%M:%S' - try: - clock_format = c['FORMAT']['TWEET']['CLOCK_FORMAT'] - except: - pass - clock = date.strftime(clock_format) + date = arrow.get(date).to('local') + if humanize: + lang, encode = locale.getdefaultlocale() + clock = arrow.get(date).to('local').humanize(locale=lang) + else: + try: + clock_format = c['FORMAT']['TWEET']['CLOCK_FORMAT'] + except: + clock_format = '%Y/%m/%d %H:%M:%S' + clock = date.datetime.strftime(clock_format) # Pull extended retweet text try: @@ -233,7 +240,7 @@ def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): tweet = text.split() # Replace url if expanded_url: - for index in range(len(expanded_url)): + for index in xrange(len(expanded_url)): tweet = lmap( lambda x: expanded_url[index] if x == url[index] @@ -270,12 +277,13 @@ def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): tweet = delimiter.join(ary) # Load config formater + formater = '' try: formater = c['FORMAT']['TWEET']['DISPLAY'] - formater = name.join(formater.split("#name")) - formater = nick.join(formater.split("#nick")) - formater = fav.join(formater.split("#fav")) - formater = tweet.join(formater.split("#tweet")) + formater = name.join(formater.split('#name')) + formater = nick.join(formater.split('#nick')) + formater = fav.join(formater.split('#fav')) + formater = tweet.join(formater.split('#tweet')) # Change clock word word = [w for w in formater.split() if '#clock' in w][0] delimiter = color_func(c['TWEET']['clock'])( @@ -285,9 +293,18 @@ def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): word = [w for w in formater.split() if '#id' in w][0] delimiter = color_func(c['TWEET']['id'])(id.join(word.split('#id'))) formater = delimiter.join(formater.split(word)) + # Change retweet count word + word = [w for w in formater.split() if '#rt_count' in w][0] + delimiter = color_func(c['TWEET']['retweet_count'])( + str(retweet_count).join(word.split('#rt_count'))) + formater = delimiter.join(formater.split(word)) + # Change favorites count word + word = [w for w in formater.split() if '#fa_count' in w][0] + delimiter = color_func(c['TWEET']['favorite_count'])( + str(favorite_count).join(word.split('#fa_count'))) + formater = delimiter.join(formater.split(word)) except: - printNicely(red('Wrong format in config.')) - return + pass # Draw printNicely(formater) @@ -322,7 +339,7 @@ def print_message(m, check_semaphore=False): recipient_name = m['recipient']['name'] mid = m['id'] date = parser.parse(m['created_at']) - date = date - datetime.timedelta(seconds=time.timezone) + date = arrow.get(date).to('local').datetime clock_format = '%Y/%m/%d %H:%M:%S' try: clock_format = c['FORMAT']['MESSAGE']['CLOCK_FORMAT'] @@ -415,8 +432,8 @@ def show_profile(u): location = 'Location : ' + color_func(c['PROFILE']['location'])(location) url = 'URL : ' + (color_func(c['PROFILE']['url'])(url) if url else '') date = parser.parse(created_at) - date = date - datetime.timedelta(seconds=time.timezone) - clock = date.strftime('%Y/%m/%d %H:%M:%S') + lang, encode = locale.getdefaultlocale() + clock = arrow.get(date).to('local').humanize(locale=lang) clock = 'Join at ' + color_func(c['PROFILE']['clock'])(clock) # Format @@ -494,8 +511,8 @@ def print_list(group): mode = color_func(c['GROUP']['mode'])('Type: ' + mode) created_at = grp['created_at'] date = parser.parse(created_at) - date = date - datetime.timedelta(seconds=time.timezone) - clock = date.strftime('%Y/%m/%d %H:%M:%S') + lang, encode = locale.getdefaultlocale() + clock = arrow.get(date).to('local').humanize(locale=lang) clock = 'Created at ' + color_func(c['GROUP']['clock'])(clock) # Create lines @@ -534,5 +551,58 @@ def show_calendar(month, date, rel): printNicely(' '.join(ary)) +def format_quote(tweet): + """ + Quoting format + """ + # Retrieve info + screen_name = '@' + tweet['user']['screen_name'] + text = tweet['text'] + # Validate quote format + if '#owner' not in c['QUOTE_FORMAT']: + printNicely(light_magenta('Quote should contains #owner')) + return False + if '#comment' not in c['QUOTE_FORMAT']: + printNicely(light_magenta('Quote format should have #comment')) + return False + # Build formater + formater = '' + try: + formater = c['QUOTE_FORMAT'] + formater = screen_name.join(formater.split('#owner')) + formater = text.join(formater.split('#tweet')) + formater = u2str(formater) + except: + pass + # Highlight like a tweet + formater = formater.split() + formater = lmap( + lambda x: light_green(x) + if x == '#comment' + else x, + formater) + formater = lmap( + lambda x: color_func(c['TWEET']['rt'])(x) + if x == 'RT' + else x, + formater) + formater = lmap(lambda x: cycle_color(x) if x[0] == '@' else x, formater) + formater = lmap( + lambda x: color_func(c['TWEET']['link'])(x) + if x[0:4] == 'http' + else x, + formater) + formater = lmap( + lambda x: color_func(c['TWEET']['hashtag'])(x) + if x.startswith('#') + else x, + formater) + formater = ' '.join(formater) + # Notice + notice = light_magenta('Quoting: "') + formater + light_magenta('"') + printNicely(notice) + return formater + + # Start the color cycle start_cycle()