fix argparse

diff --git a/README.md b/README.md
index 5be9245a21ba72580316ce6617c5010a211e0b72..3463819afa32d556eac4b95cb6bd4a2997a2c0d0 100644 (file)
--- a/README.md
+++ b/README.md
@@ -23,9 +23,10 @@ rainbow
 ```
 and see your stream.
 
-In the case you want to see photos directly in terminal, the command is 
+I shipped a feature which can display **tweet's images directly on terminal**.
+You can try it with:
 ```bash
-rainbow -img 1 # Or rainbow --image 1
+rainbow -iot # Or rainbow --image-on-term
 ```
 
 In the first time you will be asked for authorization of Rainbow Stream app at Twitter.

diff --git a/README.rst b/README.rst
index 4e0516d1cbd4c492657ad2132761ae03ef3669c4..738c1f98a88ef9378946bfe75911fdb8f4bbf09b 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -39,11 +39,12 @@ Just type
 \r
 and see your stream.\r
 \r
-In the case you want to see photos directly in terminal, the command is\r
+I shipped a feature which can display **tweet's images directly on terminal**.\r
+You can try it with:\r
 \r
 .. code:: bash\r
 \r
-    rainbow -img 1 # Or rainbow --image 1\r
+    rainbow -iot # Or rainbow --image-on-term\r
 \r
 In the first time you will be asked for authorization of Rainbow Stream\r
 app at Twitter. Just click the “Authorize access” button and paste PIN\r

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index b4005299b6448189edce668a2f6bfb8ce9ec7bd9..73af665e36d90a556af91d3fdbdb98cf94925b2d 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -49,7 +49,7 @@ cmdset = [
 ]
 
 
-def draw(t, imgflg = 0, keyword=None, fil=[], ig=[]):
+def draw(t, iot=False, keyword=None, fil=[], ig=[]):
     """
     Draw the rainbow
     """
@@ -145,7 +145,7 @@ def draw(t, imgflg = 0, keyword=None, fil=[], ig=[]):
     printNicely(line3)
 
     # Display Image
-    if imgflg and media_url:
+    if iot and media_url:
         for mu in media_url:
             response = requests.get(mu)
             image_to_display(StringIO(response.content))
@@ -183,9 +183,10 @@ def parse_arguments():
         '--ignore',
         help='Ignore specific screen_name.')
     parser.add_argument(
-        '-img',
-        '--image',
-        help='Display all photo on terminal.')
+        '-iot',
+        '--image-on-term',
+        action='store_true',
+        help='Display all image on terminal.')
     return parser.parse_args()
 
 
@@ -294,7 +295,7 @@ def home():
     if g['stuff'].isdigit():
         num = g['stuff']
     for tweet in reversed(t.statuses.home_timeline(count=num)):
-        draw(t=tweet, imgflg=g['image'])
+        draw(t=tweet, iot=g['iot'])
     printNicely('')
 
 
@@ -310,7 +311,7 @@ def view():
         except:
             num = HOME_TWEET_NUM
         for tweet in reversed(t.statuses.user_timeline(count=num, screen_name=user[1:])):
-            draw(t=tweet, imgflg=g['image'])
+            draw(t=tweet, iot=g['iot'])
         printNicely('')
     else:
         printNicely(red('A name should begin with a \'@\''))
@@ -347,7 +348,7 @@ def favorite():
         tid = db.rainbow_query(id)[0].tweet_id
         t.favorites.create(_id=tid, include_entities=False)
         printNicely(green('Favorited.'))
-        draw(t.statuses.show(id=tid), imgflg=g['image'])
+        draw(t.statuses.show(id=tid), iot=g['iot'])
     except:
         printNicely(red('Omg some syntax is wrong.'))
 
@@ -392,7 +393,7 @@ def unfavorite():
         tid = db.rainbow_query(id)[0].tweet_id
         t.favorites.destroy(_id=tid)
         printNicely(green('Okay it\'s unfavorited.'))
-        draw(t.statuses.show(id=tid), imgflg=g['image'])
+        draw(t.statuses.show(id=tid), iot=g['iot'])
     except:
         printNicely(red('Sorry I can\'t unfavorite this tweet for you.'))
 
@@ -409,7 +410,7 @@ def search():
                 printNicely('Newest tweets:')
                 for i in reversed(xrange(SEARCH_MAX_RECORD)):
                     draw(t=rel[i],
-                        imgflg=g['image'],
+                        iot=g['iot'],
                         keyword=g['stuff'].strip()[1:])
                 printNicely('')
             else:
@@ -690,7 +691,7 @@ def stream(domain, args, name='Rainbow Stream'):
         elif tweet.get('text'):
             draw(
                 t=tweet,
-                imgflg=args.image,
+                iot=args.image_on_term,
                 keyword=args.track_keywords,
                 fil=args.filter,
                 ig=args.ignore,
@@ -712,5 +713,5 @@ def fly():
     g['reset'] = True
     g['prefix'] = True
     g['stream_pid'] = p.pid
-    g['image'] = args.image
+    g['iot'] = args.image_on_term
     listen()
\ No newline at end of file

diff --git a/setup.py b/setup.py
index e4b48b0e382b6ca3198fd80492043f3793c2753e..5cf9afddddd44dd84687af05625e123c9440c29c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.0.2'
+version = '0.0.3'
 
 install_requires = [
     "SQLAlchemy",