X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=93f711a5da202630d50fcfee1e41d17c460d1a5f;hb=1dca9e246f503fc6741d888f6d3ffe3db32b6b3e;hp=71fb44183eca51a4c67cdfcf61ff7cc05e39aa1a;hpb=b9eeb635b2a477abf9a166a01c582b76ccafc182;p=rainbowstream.git diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index 71fb441..93f711a 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 * @@ -137,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 @@ -189,12 +221,12 @@ def upgrade_center(): 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(')') notice += '\n' + printNicely(notice) except: pass @@ -239,11 +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 - # Resize images based on the current terminal size - set_config('IMAGE_RESIZE_TO_FIT', str(c.get('IMAGE_RESIZE_TO_FIT', False))) # 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.')) @@ -253,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(): @@ -381,7 +412,7 @@ def view_my_tweets(): """ t = Twitter(auth=authen()) try: - num = int(g['stuff'].split()[1]) + num = int(g['stuff']) except: num = c['HOME_TWEET_NUM'] for tweet in reversed( @@ -429,6 +460,54 @@ 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(red('Pocket isn\'t enabled.')) + 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 @@ -885,7 +964,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)) @@ -1439,7 +1518,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(): @@ -1455,6 +1534,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. ' + \ @@ -1513,6 +1594,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) @@ -1779,7 +1862,7 @@ cmdset = [ 't', 'rt', 'quote', - 'mytw', + 'me', 'allrt', 'conversation', 'fav', @@ -1815,6 +1898,7 @@ cmdset = [ 'c', 'v', 'q', + 'pt', ] # Handle function set @@ -1864,6 +1948,7 @@ funcset = [ clear, upgrade_center, quit, + pocket, ] @@ -1945,6 +2030,7 @@ def listen(): [], # clear [], # version [], # quit + [], # pocket ] )) init_interactive_shell(d) @@ -1977,8 +2063,6 @@ def listen(): g['prefix'] = False else: g['prefix'] = True - # Release the semaphore lock - c['lock'] = False except EOFError: printNicely('') except TwitterHTTPError as e: @@ -1986,6 +2070,9 @@ def listen(): except Exception: debug_option() printNicely(red('OMG something is wrong with Twitter API right now.')) + finally: + # Release the semaphore lock + c['lock'] = False def reconn_notice():