improve search query

diff --git a/docs/conf.py b/docs/conf.py
index 367ae8f34f0af8c055e75e67e442f6b110f4ec44..ade949af826412a03cccb78cce33b1d50a8f2f03 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.0'
+version = '0.9.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.0'
+release = '0.9.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
index 28592b28e3473a6729f39412c34b766b2af0f48d..a11e7da274853e3dedd9b14d109813a532bf4cb6 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -319,6 +319,8 @@ You also can view or set a new value of every config key by ``config`` command (
 \r
 -  ``PREFIX``: display string of prompt.\r
 \r
+-  ``SEARCH_TYPE``: search type in 'search' command ('mixed','recent','popular').\r
+\r
 -  ``SEARCH_MAX_RECORD``: max tweets can display on 'search' command.\r
 \r
 -  ``HOME_TWEET_NUM``: default tweets to display on 'home' command.\r

diff --git a/rainbowstream/colorset/config b/rainbowstream/colorset/config
index d85d6588d073d9c649ddf66f7571bcbd2650f892..e0a3ba575e7df6a9ff9d1a429b9922db5d86dfd5 100644 (file)
--- a/rainbowstream/colorset/config
+++ b/rainbowstream/colorset/config
@@ -11,7 +11,9 @@
     "HIDE_PROMPT" : true,
     // Prefix
     "PREFIX" : "",
-    // 'search': max search record
+    // 'search': search type ('mixed','recent','popular')
+    "SEARCH_TYPE" : "mixed",
+    // 'search': search max result, number over 100 will fallback to 100
     "SEARCH_MAX_RECORD" : 5,
     // 'home': default number of home's tweets
     "HOME_TWEET_NUM" : 5,

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index f58d59c314dc158b3694394dd592054f949c7af3..de908e6ae94dfc997b8b1ef73c93b23a47106bf2 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -249,13 +249,24 @@ def search():
     Search
     """
     t = Twitter(auth=authen())
-    g['stuff'] = g['stuff'].strip()
-    rel = t.search.tweets(q=g['stuff'])['statuses']
+    # Setup query
+    query = g['stuff'].strip()
+    type = c['SEARCH_TYPE']
+    if type not in ['mixed', 'recent', 'popular']:
+        type = 'mixed'
+    max_record = c['SEARCH_MAX_RECORD']
+    count = min(max_record, 100)
+    # Perform search
+    rel = t.search.tweets(
+        q=query,
+        type=type,
+        count=count
+    )['statuses']
+    # Return results
     if rel:
         printNicely('Newest tweets:')
-        for i in reversed(xrange(c['SEARCH_MAX_RECORD'])):
-            draw(t=rel[i],
-                 keyword=g['stuff'])
+        for i in reversed(xrange(count)):
+            draw(t=rel[i], keyword=query)
         printNicely('')
     else:
         printNicely(magenta('I\'m afraid there is no result'))

diff --git a/setup.py b/setup.py
index da18822e6673db00a6f9615762c241ba88b153fc..6337cfeb2c4a29e911fa231cd75a7e6e9a220206 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '0.9.0'
+version = '0.9.1'
 
 # Require
 install_requires = [