X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fdraw.py;h=3bf392076185dc969a1adad6a63e657991af5515;hp=a0c7911805f2e0d459c49a6de8c658bd1eb9e9c1;hb=8619b00b13f74ed01902a121c3688424b5983397;hpb=77f1d210dfd44f5b6c33cc58150b633643621bb0 diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py index a0c7911..3bf3920 100644 --- a/rainbowstream/draw.py +++ b/rainbowstream/draw.py @@ -3,6 +3,7 @@ import itertools import requests import datetime import time +import re from twitter.util import printNicely from functools import wraps @@ -18,20 +19,19 @@ from .py3patch import * db = RainbowDB() g = {} + def init_cycle(): """ Init the cycle """ colors_shuffle = [globals()[i.encode('utf8')] - if not i.startswith('term_') - else term_color(int(i[5:])) - for i in c['CYCLE_COLOR']] + if not str(i).isdigit() + else term_color(int(i)) + for i in c['CYCLE_COLOR']] return itertools.cycle(colors_shuffle) -g['cyc'] = init_cycle() -g['cache'] = {} -def reset_cycle(): +def start_cycle(): """ Notify from rainbow """ @@ -44,9 +44,9 @@ def order_rainbow(s): Print a string with ordered color with each character """ colors_shuffle = [globals()[i.encode('utf8')] - if not i.startswith('term_') - else term_color(int(i[5:])) - for i in c['CYCLE_COLOR']] + if not str(i).isdigit() + else term_color(int(i)) + for i in c['CYCLE_COLOR']] colored = [colors_shuffle[i % 7](s[i]) for i in xrange(len(s))] return ''.join(colored) @@ -56,9 +56,9 @@ def random_rainbow(s): Print a string with random color with each character """ colors_shuffle = [globals()[i.encode('utf8')] - if not i.startswith('term_') - else term_color(int(i[5:])) - for i in c['CYCLE_COLOR']] + if not str(i).isdigit() + else term_color(int(i)) + for i in c['CYCLE_COLOR']] colored = [random.choice(colors_shuffle)(i) for i in s] return ''.join(colored) @@ -106,52 +106,71 @@ def show_calendar(month, date, rel): for line in rel: ary = line.split(' ') ary = lmap(lambda x: color_func(c['CAL']['today'])(x) - if x == today - else color_func(c['CAL']['days'])(x) - , ary) + if x == today + else color_func(c['CAL']['days'])(x), ary) printNicely(' '.join(ary)) -def check_theme(): +def check_config(): + """ + Check if config is changed + """ + changed = False + data = get_all_config() + for key in c: + if key in data: + if data[key] != c[key]: + changed = True + if changed: + reload_config() + + +def validate_theme(theme): + """ + Validate a theme exists or not + """ + # Theme changed check + files = os.listdir(os.path.dirname(__file__) + '/colorset') + themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json'] + return theme in themes + + +def reload_theme(current_config): """ Check current theme and update if necessary """ exists = db.theme_query() themes = [t.theme_name for t in exists] - if c['theme'] != themes[0]: - c['theme'] = themes[0] - # Determine path - if c['theme'] == 'custom': - config = os.environ.get( - 'HOME', - os.environ.get('USERPROFILE', - '')) + os.sep + '.rainbow_config.json' - else: - config = os.path.dirname(__file__) + '/colorset/'+c['theme']+'.json' + if current_config != themes[0]: + config = os.path.dirname( + __file__) + '/colorset/' + current_config + '.json' # Load new config data = load_config(config) if data: for d in data: c[d] = data[d] - # Re-init color cycle - g['cyc'] = init_cycle() + # Restart color cycle and update db/config + start_cycle() + db.theme_update(current_config) + set_config('THEME', current_config) def color_func(func_name): """ Call color function base on name """ - if func_name.startswith('term_') and func_name[5:].isdigit(): - return term_color(int(func_name[5:])) + if str(func_name).isdigit(): + return term_color(int(func_name)) return globals()[func_name] -def draw(t, iot=False, keyword=None, fil=[], ig=[]): +def draw(t, keyword=None, check_semaphore=False, fil=[], ig=[]): """ Draw the rainbow """ - check_theme() + check_config() + reload_theme(c['THEME']) # Retrieve tweet tid = t['id'] text = t['text'] @@ -163,6 +182,16 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]): date = date - datetime.timedelta(seconds=time.timezone) clock = date.strftime('%Y/%m/%d %H:%M:%S') + # Pull extended retweet text + try: + text = 'RT @' + t['retweeted_status']['user']['screen_name'] + ': ' +\ + t['retweeted_status']['text'] + except: + pass + + # Unescape HTML character + text = unescape(text) + # Get expanded url try: expanded_url = [] @@ -225,16 +254,16 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]): c['TWEET']['link'])(x) if x[ 0:4] == 'http' else x, tweet) - # Highlight search keyword - if keyword: - tweet = lmap( - lambda x: color_func(c['TWEET']['keyword'])(x) if - ''.join(c for c in x if c.isalnum()).lower() == keyword.lower() - else x, - tweet - ) - # Recreate tweet + + # Highlight keyword tweet = ' '.join(tweet) + if keyword: + roj = re.search(keyword, tweet, re.IGNORECASE) + if roj: + occur = roj.group() + ary = tweet.split(occur) + delimiter = color_func(c['TWEET']['keyword'])(occur) + tweet = delimiter.join(ary) # Draw rainbow line1 = u"{u:>{uw}}:".format( @@ -247,13 +276,19 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]): ) line3 = ' ' + tweet + # Check the semaphore lock + if check_semaphore: + while db.semaphore_query(): + time.sleep(0.5) + + # Output printNicely('') printNicely(line1) printNicely(line2) printNicely(line3) # Display Image - if iot and media_url: + if c['IMAGE_ON_TERM'] and media_url: for mu in media_url: try: response = requests.get(mu) @@ -268,7 +303,7 @@ def print_message(m): """ sender_screen_name = '@' + m['sender_screen_name'] sender_name = m['sender']['name'] - text = m['text'] + text = unescape(m['text']) recipient_screen_name = '@' + m['recipient_screen_name'] recipient_name = m['recipient']['name'] mid = m['id'] @@ -314,7 +349,7 @@ def print_message(m): printNicely(line3) -def show_profile(u, iot=False): +def show_profile(u): """ Show a profile """ @@ -387,7 +422,7 @@ def show_profile(u, iot=False): # Display printNicely('') printNicely(line1) - if iot: + if c['IMAGE_ON_TERM']: try: response = requests.get(profile_image_url) image_to_display(BytesIO(response.content), 2, 20) @@ -410,3 +445,48 @@ def print_trends(trends): line = cycle_color(name) + ': ' + color_func(c['TREND']['url'])(url) printNicely(line) printNicely('') + + +def print_list(group): + """ + Display a list + """ + for g in group: + # Format + name = g['full_name'] + name = color_func(c['GROUP']['name'])(name + ' : ') + member = str(g['member_count']) + member = color_func(c['GROUP']['member'])(member + ' member') + subscriber = str(g['subscriber_count']) + subscriber = color_func( + c['GROUP']['subscriber'])( + subscriber + + ' subscriber') + description = g['description'].strip() + description = color_func(c['GROUP']['description'])(description) + mode = g['mode'] + mode = color_func(c['GROUP']['mode'])('Type: ' + mode) + created_at = g['created_at'] + date = parser.parse(created_at) + date = date - datetime.timedelta(seconds=time.timezone) + clock = date.strftime('%Y/%m/%d %H:%M:%S') + clock = 'Created at ' + color_func(c['GROUP']['clock'])(clock) + + # Create lines + line1 = ' ' * 2 + name + member + ' ' + subscriber + line2 = ' ' * 4 + description + line3 = ' ' * 4 + mode + line4 = ' ' * 4 + clock + + # Display + printNicely('') + printNicely(line1) + printNicely(line2) + printNicely(line3) + printNicely(line4) + + printNicely('') + + +# Start the color cycle +start_cycle()