X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Frainbow.py;h=f06b510aa708d39896a8fa0ef1f07ba9b7b15514;hp=742c4e9cf2b85e3d76ac227d3c2560c8a4fef0c6;hb=620587157c57f179960c2576b591819056f813bb;hpb=d4b36355938733b0f2d3434057716a1b917a96d1 diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py index 742c4e9..f06b510 100644 --- a/rainbowstream/rainbow.py +++ b/rainbowstream/rainbow.py @@ -9,7 +9,10 @@ import requests import webbrowser import traceback import pkg_resources +import socks +import socket +from io import BytesIO from twitter.stream import TwitterStream, Timeout, HeartbeatTimeout, Hangup from twitter.api import * from twitter.oauth import OAuth, read_token_file @@ -24,6 +27,7 @@ from .interactive import * from .c_image import * from .py3patch import * from .emoji import * +from .util import * # Global values g = {} @@ -58,9 +62,48 @@ def parse_arguments(): '--image-on-term', action='store_true', help='Display all image on terminal.') + parser.add_argument( + '-ph', + '--proxy-host', + help='Use HTTP/SOCKS proxy for network connections.') + parser.add_argument( + '-pp', + '--proxy-port', + default=8080, + help='HTTP/SOCKS proxy port (Default: 8080).') + parser.add_argument( + '-pt', + '--proxy-type', + default='SOCKS5', + help='Proxy type (HTTP, SOCKS4, SOCKS5; Default: SOCKS5).') return parser.parse_args() +def proxy_connect(args): + """ + Connect to specified proxy + """ + if args.proxy_host: + # Setup proxy by monkeypatching the standard lib + if args.proxy_type.lower() == "socks5" or not args.proxy_type: + socks.set_default_proxy( + socks.SOCKS5, args.proxy_host, + int(args.proxy_port)) + elif args.proxy_type.lower() == "http": + socks.set_default_proxy( + socks.HTTP, args.proxy_host, + int(args.proxy_port)) + elif args.proxy_type.lower() == "socks4": + socks.set_default_proxy( + socks.SOCKS4, args.proxy_host, + int(args.proxy_port)) + else: + printNicely( + magenta("Sorry, wrong proxy type specified! Aborting...")) + sys.exit() + socket.socket = socks.socksocket + + def authen(): """ Authenticate with Twitter OAuth @@ -136,6 +179,11 @@ def upgrade_center(): 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) except: pass @@ -1195,6 +1243,8 @@ def switch(): # Kill old thread g['stream_stop'] = True args.track_keywords = keyword + # Reset prefix + g['PREFIX'] = u2str(emojize(c['PREFIX'])) # Start new thread th = threading.Thread( target=stream, @@ -1207,6 +1257,8 @@ def switch(): elif target == 'mine': # Kill old thread g['stream_stop'] = True + # Reset prefix + g['PREFIX'] = u2str(emojize(c['PREFIX'])) # Start new thread th = threading.Thread( target=stream, @@ -1220,7 +1272,7 @@ def switch(): elif target == 'list': owner, slug = get_slug() # Force python 2 not redraw readline buffer - g['cmd'] = '/'.join([owner, slug]) + g['PREFIX'] = g['cmd'] = '/'.join([owner, slug]) printNicely(light_yellow('getting list members ...')) # Get members t = Twitter(auth=authen()) @@ -1255,7 +1307,7 @@ def switch(): if args.ignore: printNicely(red('Ignore: ' + str(len(args.ignore)) + ' people.')) printNicely('') - except Exception: + except: debug_option() printNicely(red('Sorry I can\'t understand.')) @@ -1330,16 +1382,18 @@ def config(): value = get_default_config(key) line = ' ' * 2 + green(key) + ': ' + light_magenta(value) printNicely(line) - except Exception as e: - printNicely(red(e)) + except: + debug_option() + printNicely(red('Just can not get the default.')) # Delete specific config key in config file elif len(g['stuff'].split()) == 2 and g['stuff'].split()[-1] == 'drop': key = g['stuff'].split()[0] try: delete_config(key) printNicely(green('Config key is dropped.')) - except Exception as e: - printNicely(red(e)) + except: + debug_option() + printNicely(red('Just can not drop the key.')) # Set specific config elif len(g['stuff'].split()) == 3 and g['stuff'].split()[1] == '=': key = g['stuff'].split()[0] @@ -1349,15 +1403,18 @@ def config(): return try: set_config(key, value) - # Apply theme immediately + # Keys that needs to be apply immediately if key == 'THEME': c['THEME'] = reload_theme(value, c['THEME']) g['decorated_name'] = lambda x: color_func( c['DECORATED_NAME'])('[' + x + ']: ') + elif key == 'PREFIX': + g['PREFIX'] = u2str(emojize(c['PREFIX'])) reload_config() printNicely(green('Updated successfully.')) - except Exception as e: - printNicely(red(e)) + except: + debug_option() + printNicely(red('Just can not set the key.')) else: printNicely(light_magenta('Sorry I can\'s understand.')) @@ -1609,6 +1666,7 @@ def help(): usage += s * 2 + light_green('p') + ' will pause the stream.\n' usage += s * 2 + light_green('r') + ' will unpause the stream.\n' usage += s * 2 + light_green('c') + ' will clear the screen.\n' + usage += s * 2 + light_green('v') + ' will show version info.\n' usage += s * 2 + light_green('q') + ' will quit.\n' # End usage += '\n' @@ -1727,7 +1785,8 @@ cmdset = [ 'p', 'r', 'c', - 'q' + 'v', + 'q', ] # Handle function set @@ -1773,7 +1832,8 @@ funcset = [ pause, replay, clear, - quit + upgrade_center, + quit, ] @@ -1851,6 +1911,7 @@ def listen(): [], # pause [], # reconnect [], # clear + [], # version [], # quit ] )) @@ -1946,6 +2007,7 @@ def stream(domain, args, name='Rainbow Stream'): # Block new stream until other one exits StreamLock.acquire() g['stream_stop'] = False + last_tweet_time = time.time() for tweet in tweet_iter: if tweet is None: printNicely("-- None --") @@ -1966,6 +2028,10 @@ def stream(domain, args, name='Rainbow Stream'): StreamLock.release() break elif tweet.get('text'): + # Slow down the stream by STREAM_DELAY config key + if time.time() - last_tweet_time < c['STREAM_DELAY']: + continue + last_tweet_time = time.time() # Check the semaphore pause and lock (stream process only) if g['pause']: continue @@ -2002,10 +2068,13 @@ def stream(domain, args, name='Rainbow Stream'): elif tweet.get('event'): c['events'].append(tweet) print_event(tweet) - except TwitterHTTPError: + except TwitterHTTPError as e: printNicely('') printNicely( - magenta("We have maximum connection problem with twitter'stream API right now :(")) + magenta("We have connection problem with twitter'stream API right now :(")) + detail_twitter_error(e) + sys.stdout.write(g['decorated_name'](c['PREFIX'])) + sys.stdout.flush() def fly(): @@ -2015,14 +2084,25 @@ def fly(): # Initial args = parse_arguments() try: + proxy_connect(args) init(args) - except TwitterHTTPError: + # Twitter API connection problem + except TwitterHTTPError as e: printNicely('') printNicely( - magenta("We have connection problem with twitter'stream API right now :(")) - printNicely(magenta("Let's try again later.")) + magenta("We have connection problem with twitter'REST API right now :(")) + detail_twitter_error(e) + save_history() + sys.exit() + # Proxy connection problem + except (socks.ProxyConnectionError, URLError): + printNicely( + magenta("There seems to be a connection problem.")) + printNicely( + magenta("You might want to check your proxy settings (host, port and type)!")) save_history() sys.exit() + # Spawn stream thread th = threading.Thread( target=stream,