'--proxy-type',
default='SOCKS5',
help='Proxy type (HTTP, SOCKS4, SOCKS5; Default: SOCKS5).')
+ parser.add_argument(
+ '-ta',
+ '--twitter-auth',
+ default=os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_oauth',
+ help='Specify which OAuth profile to use for twitter. Default: ~/.rainbow_oauth.')
+ parser.add_argument(
+ '-pa',
+ '--pocket-auth',
+ default=os.environ.get('HOME', os.environ.get('USERPROFILE', '')) + os.sep + '.rainbow_pckt_oauth',
+ help='Specify which OAuth profile to use for pocket. Default: ~/.rainbow_pckt_oauth.')
return parser.parse_args()
Authenticate with Twitter OAuth
"""
# When using rainbow stream you must authorize.
- twitter_credential = os.environ.get(
- 'HOME',
- os.environ.get(
- 'USERPROFILE',
- '')) + os.sep + '.rainbow_oauth'
+ twitter_credential = g['twitter_oauth_path']
if not os.path.exists(twitter_credential):
oauth_dance('Rainbow Stream',
CONSUMER_KEY,
"""
Authenticate with Pocket OAuth
"""
- pocket_credential = os.environ.get(
- 'HOME',
- os.environ.get(
- 'USERPROFILE',
- '')) + os.sep + '.rainbow_pckt_oauth'
-
+ pocket_credential = g['pocket_oauth_path']
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="/")
# Handle Ctrl C
ctrl_c_handler = lambda signum, frame: quit()
signal.signal(signal.SIGINT, ctrl_c_handler)
+ # Set OAuth file path (needs to happen before authen is called)
+ g['twitter_oauth_path'] = args.twitter_auth
+ g['pocket_oauth_path'] = args.pocket_auth
# Upgrade notify
upgrade_center()
# Get name
g['since_id'] = result[0]['id']
for tweet in reversed(result):
draw(t=tweet)
- printNicely('')
+ if result:
+ printNicely('')
def home():
"""
# Return results
if rel:
printNicely('Newest tweets:')
- for i in reversed(xrange(count)):
+ for i in reversed(xrange(min(len(rel), count))):
draw(t=rel[i], keyword=query)
printNicely('')
else:
messages = t.direct_messages.events.list()['events']
messages = list(map(map_message, messages))
inbox = list(filter(inboxFilter, messages))
- sent = list(filter(inboxFilter, messages))
+ sent = list(filter(sentFilter, messages))
d = {}
uniq_inbox = list(set(
# Redefine decorated_name
g['decorated_name'] = lambda x: color_func(
c['DECORATED_NAME'])(
- '[' + x + ']: ')
+ '[' + x + ']: ', rl=True)
printNicely(green('Theme changed.'))
except:
printNicely(red('No such theme exists.'))
if key == 'THEME':
c['THEME'] = reload_theme(value, c['THEME'])
g['decorated_name'] = lambda x: color_func(
- c['DECORATED_NAME'])('[' + x + ']: ')
+ c['DECORATED_NAME'])('[' + x + ']: ', rl=True)
elif key == 'PREFIX':
g['PREFIX'] = u2str(emojize(format_prefix(
listname=g['listname'],