X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=27d7ef1eb24c8b3e868846c8300ad7272969023e;hp=a5cc190b858f175121cf5596a001077684b57899;hb=e6f075192ca3e2490503a7553d2f72f7a388b51d;hpb=45ff44d240a2ff4f13c474386afb6f31b6704324 diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index a5cc190..27d7ef1 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -11,6 +11,7 @@ import traceback import pkg_resources import socks import socket +import re from io import BytesIO from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup @@ -19,6 +20,8 @@ from twitter.oauth import OAuth, read_token_file from twitter.oauth_dance import oauth_dance from twitter.util import printNicely +from pocket import Pocket + from .draw import * from .colors import * from .config import * @@ -44,7 +47,7 @@ def parse_arguments(): parser.add_argument( '-s', '--stream', - default="mine", + default="mine", help='Default stream after program start. (Default: mine)') parser.add_argument( '-to', @@ -72,11 +75,6 @@ def parse_arguments(): '--color-24bit', action='store_true', help='Display images using 24bit color codes.') - parser.add_argument( - '-hr', - '--higher-resolution', - action='store_true', - help='Display images in high(er) resolution.') parser.add_argument( '-ph', '--proxy-host', @@ -142,6 +140,35 @@ def authen(): CONSUMER_SECRET) +def pckt_authen(): + """ + Authenticate with Pocket OAuth + """ + pocket_credential = os.environ.get( + 'HOME', + os.environ.get( + 'USERPROFILE', + '')) + os.sep + '.rainbow_pckt_oauth' + + if not os.path.exists(pocket_credential): + request_token = Pocket.get_request_token(consumer_key=PCKT_CONSUMER_KEY) + auth_url = Pocket.get_auth_url(code=request_token, redirect_uri="/") + webbrowser.open(auth_url) + printNicely(green("*** Press [ENTER] after authorization ***")) + raw_input() + user_credentials = Pocket.get_credentials(consumer_key=PCKT_CONSUMER_KEY, code=request_token) + access_token = user_credentials['access_token'] + f = open(pocket_credential, 'w') + f.write(access_token) + f.close() + else: + with open(pocket_credential, 'r') as f: + access_token = str(f.readlines()[0]) + f.close() + + return Pocket(PCKT_CONSUMER_KEY, access_token) + + def build_mute_dict(dict_data=False): """ Build muting list @@ -186,19 +213,20 @@ def upgrade_center(): url = 'https://raw.githubusercontent.com/DTVD/rainbowstream/master/setup.py' readme = requests.get(url).text latest = readme.split('version = \'')[1].split('\'')[0] - if current != latest: + g['using_latest'] = current == latest + if not g['using_latest']: notice = light_magenta('RainbowStream latest version is ') notice += light_green(latest) notice += light_magenta(' while your current version is ') notice += light_yellow(current) + '\n' notice += light_magenta('You should upgrade with ') notice += light_green('pip install -U rainbowstream') - printNicely(notice) else: notice = light_yellow('You are running latest version (') notice += light_green(current) notice += light_yellow(')') - printNicely(notice) + notice += '\n' + printNicely(notice) except: pass @@ -243,12 +271,8 @@ def init(args): c['message_dict'] = [] # Image on term c['IMAGE_ON_TERM'] = args.image_on_term - set_config('IMAGE_ON_TERM', str(c['IMAGE_ON_TERM'])) # Use 24 bit color c['24BIT'] = args.color_24bit - # Print images using half height blocks - c['HIGHER_RESOLUTION'] = args.higher_resolution - set_config('HIGHER_RESOLUTION', str(c['HIGHER_RESOLUTION'])) # Check type of ONLY_LIST and IGNORE_LIST if not isinstance(c['ONLY_LIST'], list): printNicely(red('ONLY_LIST is not a valid list value.')) @@ -258,6 +282,8 @@ def init(args): c['IGNORE_LIST'] = [] # Mute dict c['IGNORE_LIST'] += build_mute_dict() + # Pocket init + pckt = pckt_authen() if c['POCKET_SUPPORT'] else None def trend(): @@ -304,7 +330,10 @@ def home(): num = c['HOME_TWEET_NUM'] if g['stuff'].isdigit(): num = int(g['stuff']) - for tweet in reversed(t.statuses.home_timeline(count=num)): + kwargs = {'count': num} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + for tweet in reversed(t.statuses.home_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -329,7 +358,10 @@ def mentions(): num = c['HOME_TWEET_NUM'] if g['stuff'].isdigit(): num = int(g['stuff']) - for tweet in reversed(t.statuses.mentions_timeline(count=num)): + kwargs = {'count': num} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + for tweet in reversed(t.statuses.mentions_timeline(**kwargs)): draw(t=tweet) printNicely('') @@ -372,14 +404,34 @@ def view(): num = int(g['stuff'].split()[1]) except: num = c['HOME_TWEET_NUM'] - for tweet in reversed( - t.statuses.user_timeline(count=num, screen_name=user[1:])): + kwargs = {'count': num, 'screen_name': user[1:]} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + for tweet in reversed(t.statuses.user_timeline(**kwargs)): draw(t=tweet) printNicely('') else: printNicely(red('A name should begin with a \'@\'')) +def view_my_tweets(): + """ + Display user's recent tweets. + """ + t = Twitter(auth=authen()) + try: + num = int(g['stuff']) + except: + num = c['HOME_TWEET_NUM'] + kwargs = {'count': num, 'screen_name': g['original_name']} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + for tweet in reversed( + t.statuses.user_timeline(**kwargs)): + draw(t=tweet) + printNicely('') + + def search(): """ Search @@ -395,12 +447,15 @@ def search(): type = 'mixed' max_record = c['SEARCH_MAX_RECORD'] count = min(max_record, 100) + kwargs = { + 'q': query, + 'type': type, + 'count': count, + } + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' # Perform search - rel = t.search.tweets( - q=query, - type=type, - count=count - )['statuses'] + rel = t.search.tweets(**kwargs)['statuses'] # Return results if rel: printNicely('Newest tweets:') @@ -419,6 +474,55 @@ def tweet(): t.statuses.update(status=g['stuff']) +def pocket(): + """ + Add new link to Pocket along with tweet id + """ + if not c['POCKET_SUPPORT']: + printNicely(yellow('Pocket isn\'t enabled.')) + printNicely(yellow('You need to "config POCKET_SUPPORT = true"')) + return + + # Get tweet infos + p = pckt_authen() + + t = Twitter(auth=authen()) + try: + id = int(g['stuff'].split()[0]) + tid = c['tweet_dict'][id] + except: + printNicely(red('Sorry I can\'t understand.')) + return + + tweet = t.statuses.show(id=tid) + + if len(tweet['entities']['urls']) > 0: + url = tweet['entities']['urls'][0]['expanded_url'] + else: + url = "https://twitter.com/" + \ + tweet['user']['screen_name'] + '/status/' + str(tid) + + # Add link to pocket + try: + p.add(title=re.sub(r'(http:\/\/\S+)', r'', tweet['text']), + url=url, + tweet_id=tid) + except: + printNicely(red('Something is wrong about your Pocket account,'+ \ + ' please restart Rainbowstream.')) + pocket_credential = os.environ.get( + 'HOME', + os.environ.get( + 'USERPROFILE', + '')) + os.sep + '.rainbow_pckt_oauth' + if os.path.exists(pocket_credential): + os.remove(pocket_credential) + return + + printNicely(green('Pocketed !')) + printNicely('') + + def retweet(): """ ReTweet @@ -445,7 +549,10 @@ def quote(): printNicely(red('Sorry I can\'t understand.')) return tid = c['tweet_dict'][id] - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + tweet = t.statuses.show(**kwargs) # Get formater formater = format_quote(tweet) if not formater: @@ -479,7 +586,10 @@ def allretweet(): except: num = c['RETWEETS_SHOW_NUM'] # Get result and display - rt_ary = t.statuses.retweets(id=tid, count=num) + kwargs = {'id': tid, 'count': num} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + rt_ary = t.statuses.retweets(**kwargs) if not rt_ary: printNicely(magenta('This tweet has no retweet.')) return @@ -499,14 +609,18 @@ def conversation(): printNicely(red('Sorry I can\'t understand.')) return tid = c['tweet_dict'][id] - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + tweet = t.statuses.show(**kwargs) limit = c['CONVERSATION_MAX'] thread_ref = [] thread_ref.append(tweet) prev_tid = tweet['in_reply_to_status_id'] while prev_tid and limit: limit -= 1 - tweet = t.statuses.show(id=prev_tid) + kwargs['id'] = prev_tid + tweet = t.statuses.show(**kwargs) prev_tid = tweet['in_reply_to_status_id'] thread_ref.append(tweet) @@ -528,7 +642,12 @@ def reply(): tid = c['tweet_dict'][id] user = t.statuses.show(id=tid)['user']['screen_name'] status = ' '.join(g['stuff'].split()[1:]) - status = '@' + user + ' ' + str2u(status) + # don't include own username for tweet chains + # for details see issue https://github.com/DTVD/rainbowstream/issues/163 + if user == g['original_name']: + status = str2u(status) + else: + status = '@' + user + ' ' + str2u(status) t.statuses.update(status=status, in_reply_to_status_id=tid) @@ -568,7 +687,10 @@ def favorite(): tid = c['tweet_dict'][id] t.favorites.create(_id=tid, include_entities=False) printNicely(green('Favorited.')) - draw(t.statuses.show(id=tid)) + kwargs = {'id': tid} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + draw(t.statuses.show(**kwargs)) printNicely('') @@ -585,7 +707,10 @@ def unfavorite(): tid = c['tweet_dict'][id] t.favorites.destroy(_id=tid) printNicely(green('Okay it\'s unfavorited.')) - draw(t.statuses.show(id=tid)) + kwargs = {'id': tid} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + draw(t.statuses.show(**kwargs)) printNicely('') @@ -600,7 +725,10 @@ def share(): except: printNicely(red('Tweet id is not valid.')) return - tweet = t.statuses.show(id=tid) + kwargs = {'id': tid} + if not c.get('DISABLE_EXTENDED_TWEETS'): + kwargs['tweet_mode'] = 'extended' + tweet = t.statuses.show(**kwargs) url = 'https://twitter.com/' + \ tweet['user']['screen_name'] + '/status/' + str(tid) import platform @@ -658,14 +786,14 @@ def urlopen(): return tid = c['tweet_dict'][int(g['stuff'])] tweet = t.statuses.show(id=tid) - link_prefix = ('http://', 'https://') - link_ary = [u for u in tweet['text'].split() - if u.startswith(link_prefix)] - if not link_ary: + urls = tweet['entities']['urls'] + if not urls: printNicely(light_magenta('No url here @.@!')) return - for link in link_ary: - webbrowser.open(link) + else: + for url in urls: + expanded_url = url['expanded_url'] + webbrowser.open(expanded_url) except: debug_option() printNicely(red('Sorry I can\'t open url in this tweet.')) @@ -813,24 +941,41 @@ def ls(): d = {'fl': 'followers', 'fr': 'friends'} next_cursor = -1 rel = {} + + printNicely('All ' + d[target] + ':') + # Cursor loop + number_of_users = 0 while next_cursor != 0: + list = getattr(t, d[target]).list( screen_name=name, cursor=next_cursor, skip_status=True, include_entities=False, ) + for u in list['users']: - rel[u['name']] = '@' + u['screen_name'] + + number_of_users += 1 + + # Print out result + printNicely( ' ' \ + + cycle_color( u['name'] ) \ + + color_func(c['TWEET']['nick'])( ' @' \ + + u['screen_name'] \ + + ' ' ) ) + next_cursor = list['next_cursor'] - # Print out result - printNicely('All: ' + str(len(rel)) + ' ' + d[target] + '.') - for name in rel: - user = ' ' + cycle_color(name) - user += color_func(c['TWEET']['nick'])(' ' + rel[name] + ' ') - printNicely(user) + # 300 users means 15 calls to the related API. The rate limit is 15 + # calls per 15mn periods (see Twitter documentation). + if ( number_of_users % 300 == 0 ): + printNicely(light_yellow( 'We reached the limit of Twitter API.' )) + printNicely(light_yellow( 'You may need to wait about 15 minutes.' )) + break + + printNicely('All: ' + str(number_of_users) + ' ' + d[target] + '.') def follow(): """ @@ -875,7 +1020,7 @@ def mute(): 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'] += [screen_name] c['IGNORE_LIST'] = list(set(c['IGNORE_LIST'])) else: printNicely(red(rel)) @@ -1299,8 +1444,8 @@ def switch(): printNicely(light_magenta(guide)) only = raw_input('Only nicks [Ex: @xxx,@yy]: ') ignore = raw_input('Ignore nicks [Ex: @xxx,@yy]: ') - args.filter = filter(None, only.split(',')) - args.ignore = filter(None, ignore.split(',')) + args.filter = list(filter(None, only.split(','))) + args.ignore = list(filter(None, ignore.split(','))) except: printNicely(red('Sorry, wrong format.')) return @@ -1429,7 +1574,7 @@ def config(): debug_option() printNicely(red('Just can not set the key.')) else: - printNicely(light_magenta('Sorry I can\'s understand.')) + printNicely(light_magenta('Sorry I can\'t understand.')) def help_discover(): @@ -1445,6 +1590,8 @@ def help_discover(): light_green('trend JP Tokyo') + '.\n' usage += s * 2 + light_green('home') + ' will show your timeline. ' + \ light_green('home 7') + ' will show 7 tweets.\n' + usage += s * 2 + light_green('me') + ' will show your latest tweets. ' + \ + light_green('me 2') + ' will show your last 2 tweets.\n' usage += s * 2 + \ light_green('notification') + ' will show your recent notification.\n' usage += s * 2 + light_green('mentions') + ' will show mentions timeline. ' + \ @@ -1503,6 +1650,8 @@ def help_tweets(): light_yellow('[id=12]') + ' in your OS\'s image viewer.\n' usage += s * 2 + light_green('open 12') + ' will open url in tweet with ' + \ light_yellow('[id=12]') + ' in your OS\'s default browser.\n' + usage += s * 2 + light_green('pt 12') + ' will add tweet with ' + \ + light_yellow('[id=12]') + ' in your Pocket list.\n' printNicely(usage) @@ -1769,6 +1918,7 @@ cmdset = [ 't', 'rt', 'quote', + 'me', 'allrt', 'conversation', 'fav', @@ -1804,6 +1954,7 @@ cmdset = [ 'c', 'v', 'q', + 'pt', ] # Handle function set @@ -1817,6 +1968,7 @@ funcset = [ tweet, retweet, quote, + view_my_tweets, allretweet, conversation, favorite, @@ -1852,6 +2004,7 @@ funcset = [ clear, upgrade_center, quit, + pocket, ] @@ -1878,6 +2031,7 @@ def listen(): [], # tweet [], # retweet [], # quote + [], # view_my_tweets [], # allretweet [], # conversation [], # favorite @@ -1932,6 +2086,7 @@ def listen(): [], # clear [], # version [], # quit + [], # pocket ] )) init_interactive_shell(d) @@ -1956,6 +2111,7 @@ def listen(): c['lock'] = True # Save cmd to global variable and call process g['stuff'] = ' '.join(line.split()[1:]) + # Check tweet length # Process the command process(cmd)() # Not re-display @@ -1963,13 +2119,16 @@ def listen(): g['prefix'] = False else: g['prefix'] = True - # Release the semaphore lock - c['lock'] = False except EOFError: printNicely('') + except TwitterHTTPError as e: + detail_twitter_error(e) except Exception: debug_option() - printNicely(red('OMG something is wrong with Twitter right now.')) + printNicely(red('OMG something is wrong with Twitter API right now.')) + finally: + # Release the semaphore lock + c['lock'] = False def reconn_notice(): @@ -2224,7 +2383,7 @@ def fly(): # Spawn stream thread target = args.stream.split()[0] - if target == 'mine' : + if target == 'mine': spawn_personal_stream(args) else: try: