version command fixed

[rainbowstream.git] / rainbowstream / rainbow.py

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 4b1ae255c9bb1ec33e7b24f6d1c3d5b8fec50ba2..465299f0e41b96b28694e4645f58f32cffb0357e 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -44,7 +44,7 @@ def parse_arguments():
     parser.add_argument(
         '-s',
         '--stream',
     parser.add_argument(
         '-s',
         '--stream',

-             default="mine",
+        default="mine",

         help='Default stream after program start. (Default: mine)')
     parser.add_argument(
         '-to',
         help='Default stream after program start. (Default: mine)')
     parser.add_argument(
         '-to',


@@ -67,6 +67,11 @@ def parse_arguments():
         '--image-on-term',
         action='store_true',
         help='Display all image on terminal.')
         '--image-on-term',
         action='store_true',
         help='Display all image on terminal.')

+    parser.add_argument(
+        '-24',
+        '--color-24bit',
+        action='store_true',
+        help='Display images using 24bit color codes.')

     parser.add_argument(
         '-ph',
         '--proxy-host',
     parser.add_argument(
         '-ph',
         '--proxy-host',


@@ -176,19 +181,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]
         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')
             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(')')
         else:
             notice = light_yellow('You are running latest version (')
             notice += light_green(current)
             notice += light_yellow(')')

-            printNicely(notice)
+            notice += '\n'
+        printNicely(notice)

     except:
         pass
 
     except:
         pass
 


@@ -233,7 +239,8 @@ def init(args):
     c['message_dict'] = []
     # Image on term
     c['IMAGE_ON_TERM'] = args.image_on_term
     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

     # 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.'))
     # 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.'))


@@ -365,6 +372,21 @@ def view():
         printNicely(red('A name should begin with a \'@\''))
 
 
         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']
+    for tweet in reversed(
+            t.statuses.user_timeline(count=num, screen_name=g['original_name'])):
+        draw(t=tweet)
+    printNicely('')
+
+

 def search():
     """
     Search
 def search():
     """
     Search


@@ -643,14 +665,14 @@ def urlopen():
             return
         tid = c['tweet_dict'][int(g['stuff'])]
         tweet = t.statuses.show(id=tid)
             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
             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.'))
     except:
         debug_option()
         printNicely(red('Sorry I can\'t open url in this tweet.'))


@@ -860,7 +882,7 @@ def mute():
             rel = t.mutes.users.create(screen_name=screen_name[1:])
             if isinstance(rel, dict):
                 printNicely(green(screen_name + ' is muted.'))
             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))
                 c['IGNORE_LIST'] = list(set(c['IGNORE_LIST']))
             else:
                 printNicely(red(rel))


@@ -1291,7 +1313,7 @@ def switch():
             return
         # Kill old thread
         g['stream_stop'] = True
             return
         # Kill old thread
         g['stream_stop'] = True

-        try: 
+        try:

             stuff = g['stuff'].split()[1]
         except:
             stuff = None
             stuff = g['stuff'].split()[1]
         except:
             stuff = None


@@ -1430,6 +1452,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'
         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. ' + \
     usage += s * 2 + \
         light_green('notification') + ' will show your recent notification.\n'
     usage += s * 2 + light_green('mentions') + ' will show mentions timeline. ' + \


@@ -1754,6 +1778,7 @@ cmdset = [
     't',
     'rt',
     'quote',
     't',
     'rt',
     'quote',

+    'me',

     'allrt',
     'conversation',
     'fav',
     'allrt',
     'conversation',
     'fav',


@@ -1802,6 +1827,7 @@ funcset = [
     tweet,
     retweet,
     quote,
     tweet,
     retweet,
     quote,

+    view_my_tweets,

     allretweet,
     conversation,
     favorite,
     allretweet,
     conversation,
     favorite,


@@ -1863,6 +1889,7 @@ def listen():
             [],  # tweet
             [],  # retweet
             [],  # quote
             [],  # tweet
             [],  # retweet
             [],  # quote

+            [],  # view_my_tweets

             [],  # allretweet
             [],  # conversation
             [],  # favorite
             [],  # allretweet
             [],  # conversation
             [],  # favorite


@@ -1942,33 +1969,23 @@ def listen():
             # Save cmd to global variable and call process
             g['stuff'] = ' '.join(line.split()[1:])
             # Check tweet length
             # Save cmd to global variable and call process
             g['stuff'] = ' '.join(line.split()[1:])
             # Check tweet length

-            if check_tweet_length():
-                # Process the command
-                process(cmd)()
-                # Not re-display
-                if cmd in ['switch', 't', 'rt', 'rep']:
-                    g['prefix'] = False
-                else:
-                    g['prefix'] = True
-            # Release the semaphore lock
-            c['lock'] = False
+            # Process the command
+            process(cmd)()
+            # Not re-display
+            if cmd in ['switch', 't', 'rt', 'rep']:
+                g['prefix'] = False
+            else:
+                g['prefix'] = True

         except EOFError:
             printNicely('')
         except EOFError:
             printNicely('')

+        except TwitterHTTPError as e:
+            detail_twitter_error(e)

         except Exception:
             debug_option()
         except Exception:
             debug_option()

-            printNicely(red('OMG something is wrong with Twitter right now.'))
-
-
-def check_tweet_length():
-    """
-    Check tweet length (should be <= 140 chars)
-    """
-    length = len(g['stuff'])
-    if length <= 140:
-        return True
-
-    printNicely(red("Message is too long: %s chars" % length))
-    return False
+            printNicely(red('OMG something is wrong with Twitter API right now.'))
+        finally:
+            # Release the semaphore lock
+            c['lock'] = False

 
 
 def reconn_notice():
 
 
 def reconn_notice():


@@ -2223,7 +2240,7 @@ def fly():
 
     # Spawn stream thread
     target = args.stream.split()[0]
 
     # Spawn stream thread
     target = args.stream.split()[0]

-    if target == 'mine' :
+    if target == 'mine':

         spawn_personal_stream(args)
     else:
         try:
         spawn_personal_stream(args)
     else:
         try: