X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fdraw.py;h=148fc5884456378dfa81f376f6e8bec921510f39;hp=c96d96ef79c534841a0bfbc7f7ff7319003d8fbb;hb=f75930c6e0b0ec505732b758d414162a8bebdece;hpb=2da50cc407566fd347fd37e0546ef727e0ebb7b4 diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py index c96d96e..148fc58 100644 --- a/rainbowstream/draw.py +++ b/rainbowstream/draw.py @@ -15,11 +15,46 @@ from .db import * db = RainbowDB() +def check_theme(): + """ + 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 = 'rainbowstream/colorset/'+c['theme']+'.json' + # Load new config + data = load_config(config) + if data: + for d in data: + c[d] = data[d] + + +def color_func(func_name): + """ + Call color function base on name + """ + pure = func_name.encode('utf8') + if pure.startswith('RGB_') and pure[4:].isdigit(): + return RGB(int(pure[4:])) + return globals()[pure] + + def draw(t, iot=False, keyword=None, fil=[], ig=[]): """ Draw the rainbow """ + check_theme() # Retrieve tweet tid = t['id'] text = t['text'] @@ -67,10 +102,12 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]): rid = res[0].rainbow_id # Format info - user = cycle_color(name) + grey(' ' + screen_name + ' ') - meta = grey('[' + clock + '] [id=' + str(rid) + '] ') + user = cycle_color( + name) + color_func(c['TWEET']['nick'])(' ' + screen_name + ' ') + meta = color_func(c['TWEET']['clock'])( + '[' + clock + '] ') + color_func(c['TWEET']['id'])('[id=' + str(rid) + '] ') if favorited: - meta = meta + green(u'\u2605') + meta = meta + color_func(c['TWEET']['favorite'])(u'\u2605') tweet = text.split() # Replace url if expanded_url: @@ -79,15 +116,22 @@ def draw(t, iot=False, keyword=None, fil=[], ig=[]): lambda x: expanded_url[index] if x == url[index] else x, tweet) # Highlight RT - tweet = map(lambda x: grey(x) if x == 'RT' else x, tweet) + tweet = map( + lambda x: color_func( + c['TWEET']['rt'])(x) if x == 'RT' else x, + tweet) # Highlight screen_name tweet = map(lambda x: cycle_color(x) if x[0] == '@' else x, tweet) # Highlight link - tweet = map(lambda x: cyan(x) if x[0:4] == 'http' else x, tweet) + tweet = map( + lambda x: color_func( + c['TWEET']['link'])(x) if x[ + 0:4] == 'http' else x, + tweet) # Highlight search keyword if keyword: tweet = map( - lambda x: on_yellow(x) if + lambda x: color_func(c['TWEET']['keyword'])(x) if ''.join(c for c in x if c.isalnum()).lower() == keyword.lower() else x, tweet @@ -139,11 +183,18 @@ def print_message(m): res = db.message_to_rainbow_query(mid) rid = res[0].rainbow_id - sender = cycle_color(sender_name) + grey(' ' + sender_screen_name + ' ') - recipient = cycle_color( - recipient_name) + grey(' ' + recipient_screen_name + ' ') - user = sender + magenta(' >>> ') + recipient - meta = grey('[' + clock + '] [message_id=' + str(rid) + '] ') + # Draw + sender = cycle_color( + sender_name) + color_func(c['MESSAGE']['sender'])(' ' + sender_screen_name + ' ') + recipient = cycle_color(recipient_name) + color_func( + c['MESSAGE']['recipient'])( + ' ' + recipient_screen_name + ' ') + user = sender + color_func(c['MESSAGE']['to'])(' >>> ') + recipient + meta = color_func( + c['MESSAGE']['clock'])( + '[' + clock + ']') + color_func( + c['MESSAGE']['id'])( + ' [message_id=' + str(rid) + '] ') text = ''.join(map(lambda x: x + ' ' if x == '\n' else x, text)) line1 = u"{u:>{uw}}:".format( @@ -178,22 +229,35 @@ def show_profile(u, iot=False): statuses_count = u['statuses_count'] friends_count = u['friends_count'] followers_count = u['followers_count'] + # Create content - statuses_count = green(str(statuses_count) + ' tweets') - friends_count = green(str(friends_count) + ' following') - followers_count = green(str(followers_count) + ' followers') + statuses_count = color_func( + c['PROFILE']['statuses_count'])( + str(statuses_count) + + ' tweets') + friends_count = color_func( + c['PROFILE']['friends_count'])( + str(friends_count) + + ' following') + followers_count = color_func( + c['PROFILE']['followers_count'])( + str(followers_count) + + ' followers') count = statuses_count + ' ' + friends_count + ' ' + followers_count - user = cycle_color(name) + grey(' @' + screen_name + ' : ') + count - profile_image_raw_url = 'Profile photo: ' + cyan(profile_image_url) + user = cycle_color( + name) + color_func(c['PROFILE']['nick'])(' @' + screen_name + ' : ') + count + profile_image_raw_url = 'Profile photo: ' + \ + color_func(c['PROFILE']['profile_image_url'])(profile_image_url) description = ''.join( map(lambda x: x + ' ' * 4 if x == '\n' else x, description)) - description = yellow(description) - location = 'Location : ' + magenta(location) - url = 'URL : ' + (cyan(url) if url else '') + description = color_func(c['PROFILE']['description'])(description) + 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') - clock = 'Join at ' + white(clock) + clock = 'Join at ' + color_func(c['PROFILE']['clock'])(clock) + # Format line1 = u"{u:>{uw}}".format( u=user, @@ -219,6 +283,7 @@ def show_profile(u, iot=False): c=clock, cw=len(clock) + 4, ) + # Display printNicely('') printNicely(line1) @@ -236,10 +301,9 @@ def print_trends(trends): """ Display topics """ - for topic in trends[:TREND_MAX]: + for topic in trends[:c['TREND_MAX']]: name = topic['name'] url = topic['url'] - line = cycle_color(name) + ': ' + cyan(url) + line = cycle_color(name) + ': ' + color_func(c['TREND']['url'])(url) printNicely(line) printNicely('') -