removed unneeded code

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 102b1e4b4d293fd0925e25e95c38c7f23a01ad1b..d51ca91b1d30bc5cde4c755c2028384639238712 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -9,6 +9,7 @@ import sys
 import signal
 import argparse
 import time
+import threading
 import requests
 import webbrowser
 
@@ -33,6 +34,10 @@ g = {}
 # Database
 db = RainbowDB()
 
+# Lock for streams
+
+StreamLock = threading.Lock()
+
 # Commands
 cmdset = [
     'switch',
@@ -70,6 +75,8 @@ cmdset = [
     'config',
     'theme',
     'h',
+    'p',
+    'r',
     'c',
     'q'
 ]
@@ -141,6 +148,9 @@ def init(args):
     """
     Init function
     """
+    # Handle Ctrl C
+    ctrl_c_handler = lambda signum, frame: quit()
+    signal.signal(signal.SIGINT, ctrl_c_handler)
     # Get name
     t = Twitter(auth=authen())
     name = '@' + t.account.verify_credentials()['screen_name']
@@ -156,7 +166,7 @@ def init(args):
     g['themes'] = themes
     db.theme_store(c['THEME'])
     # Semaphore init
-    db.semaphore_store(False)
+    db.semaphore_store(False, False)
     # Image on term
     c['IMAGE_ON_TERM'] = args.image_on_term
 
@@ -188,37 +198,28 @@ def switch():
             keyword = g['stuff'].split()[1]
             if keyword[0] == '#':
                 keyword = keyword[1:]
-            # Kill old process
-            os.kill(g['stream_pid'], signal.SIGKILL)
+            # Kill old thread
+            g['stream_stop'] = True
             args.track_keywords = keyword
-            # Start new process
-            p = Process(
-                target=stream,
-                args=(
-                    c['PUBLIC_DOMAIN'],
-                    args))
-            p.start()
-            g['stream_pid'] = p.pid
+            # Start new thread
+            th = threading.Thread(target=stream, args=(c['PUBLIC_DOMAIN'], args))
+            th.daemon = True
+            th.start()
         # Personal stream
         elif target == 'mine':
-            # Kill old process
-            os.kill(g['stream_pid'], signal.SIGKILL)
-            # Start new process
-            p = Process(
-                target=stream,
-                args=(
-                    c['USER_DOMAIN'],
-                    args,
-                    g['original_name']))
-            p.start()
-            g['stream_pid'] = p.pid
+            # Kill old thread
+            g['stream_stop'] = True
+            # Start new thread
+            th = threading.Thread(target=stream, args=(c['USER_DOMAIN'], args, g['original_name']))
+            th.daemon = True
+            th.start()
         printNicely('')
         if args.filter:
             printNicely(cyan('Only: ' + str(args.filter)))
         if args.ignore:
             printNicely(red('Ignore: ' + str(args.ignore)))
         printNicely('')
-    except:
+    except Exception:
         printNicely(red('Sorry I can\'t understand.'))
 
 
@@ -911,7 +912,7 @@ def list_add(t):
             slug=slug,
             owner_screen_name=owner,
             screen_name=user_name)
-        printNicely(light_green('Added.'))
+        printNicely(green('Added.'))
     except:
         printNicely(light_magenta('I\'m sorry we can not add him/her.'))
 
@@ -930,7 +931,7 @@ def list_remove(t):
             slug=slug,
             owner_screen_name=owner,
             screen_name=user_name)
-        printNicely(light_green('Gone.'))
+        printNicely(green('Gone.'))
     except:
         printNicely(light_magenta('I\'m sorry we can not remove him/her.'))
 
@@ -945,7 +946,7 @@ def list_subscribe(t):
         t.lists.subscribers.create(
             slug=slug,
             owner_screen_name=owner)
-        printNicely(light_green('Done.'))
+        printNicely(green('Done.'))
     except:
         printNicely(
             light_magenta('I\'m sorry you can not subscribe to this list.'))
@@ -961,7 +962,7 @@ def list_unsubscribe(t):
         t.lists.subscribers.destroy(
             slug=slug,
             owner_screen_name=owner)
-        printNicely(light_green('Done.'))
+        printNicely(green('Done.'))
     except:
         printNicely(
             light_magenta('I\'m sorry you can not unsubscribe to this list.'))
@@ -997,7 +998,7 @@ def list_new(t):
             name=name,
             mode=mode,
             description=description)
-        printNicely(light_green(name + ' list is created.'))
+        printNicely(green(name + ' list is created.'))
     except:
         printNicely(red('Oops something is wrong with Twitter :('))
 
@@ -1024,7 +1025,7 @@ def list_update(t):
                 owner_screen_name=g['original_name'],
                 mode=mode,
                 description=description)
-        printNicely(light_green(slug + ' list is updated.'))
+        printNicely(green(slug + ' list is updated.'))
     except:
         printNicely(red('Oops something is wrong with Twitter :('))
 
@@ -1038,7 +1039,7 @@ def list_delete(t):
         t.lists.destroy(
             slug='-'.join(slug.split()),
             owner_screen_name=g['original_name'])
-        printNicely(light_green(slug + ' list is deleted.'))
+        printNicely(green(slug + ' list is deleted.'))
     except:
         printNicely(red('Oops something is wrong with Twitter :('))
 
@@ -1095,7 +1096,7 @@ def config():
     if not g['stuff']:
         for k in all_config:
             line = ' ' * 2 + \
-                light_green(k) + ': ' + light_yellow(str(all_config[k]))
+                green(k) + ': ' + light_yellow(str(all_config[k]))
             printNicely(line)
         guide = 'Detailed explanation can be found at ' + \
             color_func(c['TWEET']['link'])(
@@ -1106,7 +1107,7 @@ def config():
         if g['stuff'] in all_config:
             k = g['stuff']
             line = ' ' * 2 + \
-                light_green(k) + ': ' + light_yellow(str(all_config[k]))
+                green(k) + ': ' + light_yellow(str(all_config[k]))
             printNicely(line)
         else:
             printNicely(red('No such config key.'))
@@ -1115,7 +1116,7 @@ def config():
         key = g['stuff'].split()[0]
         try:
             value = get_default_config(key)
-            line = ' ' * 2 + light_green(key) + ': ' + light_magenta(value)
+            line = ' ' * 2 + green(key) + ': ' + light_magenta(value)
             printNicely(line)
         except:
             printNicely(
@@ -1125,7 +1126,7 @@ def config():
         key = g['stuff'].split()[0]
         try:
             delete_config(key)
-            printNicely(light_green('Config key is dropped.'))
+            printNicely(green('Config key is dropped.'))
         except:
             printNicely(red('No such config key.'))
     # Set specific config
@@ -1143,7 +1144,7 @@ def config():
                 g['decorated_name'] = lambda x: color_func(
                     c['DECORATED_NAME'])(
                     '[' + x + ']: ')
-            printNicely(light_green('Updated successfully.'))
+            printNicely(green('Updated successfully.'))
         except:
             printNicely(light_magenta('Not valid value.'))
             return
@@ -1416,6 +1417,8 @@ def help():
     usage += '\n'
     usage += s + grey(u'\u266A' + ' Screening \n')
     usage += s * 2 + light_green('h') + ' will show this help again.\n'
+    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('q') + ' will quit.\n'
     # End
@@ -1437,6 +1440,22 @@ def help():
         printNicely(usage)
 
 
+def pause():
+    """
+    Pause stream display
+    """
+    db.semaphore_update_pause(True)
+    printNicely(green('Stream is paused'))
+
+
+def replay():
+    """
+    Replay stream
+    """
+    db.semaphore_update_pause(False)
+    printNicely(green('Stream is running back now'))
+
+
 def clear():
     """
     Clear screen
@@ -1448,9 +1467,12 @@ def quit():
     """
     Exit all
     """
-    save_history()
-    os.system('rm -rf rainbow.db')
-    os.kill(g['stream_pid'], signal.SIGKILL)
+    try:
+        save_history()
+        os.system('rm -rf rainbow.db')
+        printNicely(green('See you next time :)'))
+    except:
+        pass
     sys.exit()
 
 
@@ -1509,6 +1531,8 @@ def process(cmd):
             config,
             theme,
             help,
+            pause,
+            replay,
             clear,
             quit
         ]
@@ -1576,6 +1600,8 @@ def listen():
                 'list',
                 'stream'
             ],  # help
+            [],  # pause
+            [],  # reconnect
             [],  # clear
             [],  # quit
         ]
@@ -1587,6 +1613,7 @@ def listen():
         if g['prefix']:
             line = raw_input(g['decorated_name'](c['PREFIX']))
         else:
+            print('prefix is false')
             line = raw_input()
         try:
             cmd = line.split()[0]
@@ -1595,18 +1622,18 @@ def listen():
         g['cmd'] = cmd
         try:
             # Lock the semaphore
-            db.semaphore_update(True)
+            db.semaphore_update_lock(True)
             # Save cmd to global variable and call process
             g['stuff'] = ' '.join(line.split()[1:])
             # Process the command
             process(cmd)()
             # Not re-display
-            if cmd in ['switch', 't', 'rt', 'rep']:
+            if cmd in ['t', 'rt', 'rep']:
                 g['prefix'] = False
             else:
                 g['prefix'] = True
             # Release the semaphore lock
-            db.semaphore_update(False)
+            db.semaphore_update_lock(False)
         except Exception:
             printNicely(red('OMG something is wrong with Twitter right now.'))
 
@@ -1626,7 +1653,7 @@ def stream(domain, args, name='Rainbow Stream'):
     # These arguments are optional:
     stream_args = dict(
         timeout=args.timeout,
-        block=not args.no_block,
+        block=False,
         heartbeat_timeout=args.heartbeat_timeout)
     # Track keyword
     query_args = dict()
@@ -1647,9 +1674,15 @@ def stream(domain, args, name='Rainbow Stream'):
                 tweet_iter = stream.statuses.filter(**query_args)
             else:
                 tweet_iter = stream.statuses.sample()
+        # Block new stream until other one exits
+        StreamLock.acquire()
+        g['stream_stop'] = False
         for tweet in tweet_iter:
+            if(g['stream_stop'] == True):
+                StreamLock.release()
+                break
             if tweet is None:
-                printNicely("-- None --")
+                pass
             elif tweet is Timeout:
                 printNicely("-- Timeout --")
             elif tweet is HeartbeatTimeout:
@@ -1664,8 +1697,10 @@ def stream(domain, args, name='Rainbow Stream'):
                     fil=args.filter,
                     ig=args.ignore,
                 )
+                sys.stdout.write(g['decorated_name'](c['PREFIX']) + readline.get_line_buffer())
+                sys.stdout.flush()
             elif tweet.get('direct_message'):
-                print_message(tweet['direct_message'])
+                print_message(tweet['direct_message'], check_semaphore=True)
     except TwitterHTTPError:
         printNicely('')
         printNicely(
@@ -1683,23 +1718,17 @@ def fly():
     except TwitterHTTPError:
         printNicely('')
         printNicely(
-            magenta("Something wrong with Twitter Oauth right now :("))
-        printNicely(
-            magenta("Please delete ~/.rainbow_oauth and try again."))
+            magenta("We have maximum connection problem with twitter'stream API right now :("))
+        printNicely(magenta("Let's try again later."))
         save_history()
         os.system('rm -rf rainbow.db')
         sys.exit()
-    # Spawn stream process
-    p = Process(
-        target=stream,
-        args=(
-            c['USER_DOMAIN'],
-            args,
-            g['original_name']))
-    p.start()
+    # Spawn stream thread
+    th = threading.Thread(target=stream, args=(c['USER_DOMAIN'], args, g['original_name']))
+    th.daemon = True
+    th.start()
     # Start listen process
     time.sleep(0.5)
     g['reset'] = True
     g['prefix'] = True
-    g['stream_pid'] = p.pid
     listen()