config heartbeat-timeout to 120

diff --git a/docs/conf.py b/docs/conf.py
index e483b836924aa14d459275a1c7343688daef85ce..6bd0014beb25fc25c5e68971393eb527e9822d35 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.
 # built documents.
 #
 # The short X.Y version.

-version = '0.7.3'
+version = '0.7.4'

 # The full version, including alpha/beta/rc tags.
 # The full version, including alpha/beta/rc tags.

-release = '0.7.3'
+release = '0.7.4'

 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 
 # 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 377d21f5df33840a364d2205329ff43eafe3f058..1f4674eef4c36b14abd0e69725748c07d176d9ab 100644 (file)
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -290,11 +290,17 @@ Config explanation
 Rainbow Stream has a config file located at ``~/.rainbow_config.json``.\r
 You can view or set a new value of every config key by ``config`` command (See **Interactive mode** section above).\r
 \r
 Rainbow Stream has a config file located at ``~/.rainbow_config.json``.\r
 You can view or set a new value of every config key by ``config`` command (See **Interactive mode** section above).\r
 \r

+-  ``HEARTBEAT_TIMEOUT``: after this timeout (count by minutes), the stream will automatically hangup.\r
+\r
+-  ``IMAGE_ON_TERM``: display tweet's image directly on terminal.\r
+\r

 -  ``THEME``: current theme.\r
 \r
 -  ``ASCII_ART``: diplay your twitter name by ascii art at stream begin or not.\r
 \r
 -  ``THEME``: current theme.\r
 \r
 -  ``ASCII_ART``: diplay your twitter name by ascii art at stream begin or not.\r
 \r

--  ``HIDE_PROMPT``: Hide prompt after receiving a tweet or not.\r
+-  ``HIDE_PROMPT``: hide prompt after receiving a tweet or not.\r
+\r
+-  ``PREFIX``: display string of prompt.\r

 \r
 -  ``SEARCH_MAX_RECORD``: max tweets can display on 'search' command.\r
 \r
 \r
 -  ``SEARCH_MAX_RECORD``: max tweets can display on 'search' command.\r
 \r

diff --git a/rainbowstream/colorset/config b/rainbowstream/colorset/config
index 086ec40860617bbd545fb1d3825c81bec93e497c..da155839b0ae1fb033fae6fd138cd89c6862b703 100644 (file)
--- a/rainbowstream/colorset/config
+++ b/rainbowstream/colorset/config
@@ -1,4 +1,6 @@
 {
 {

+    // After 120 minutes, the stream will automatically hangup
+    "HEARTBEAT_TIMEOUT" : 120,

     // Image on term
     "IMAGE_ON_TERM" : false,
     // Themes
     // Image on term
     "IMAGE_ON_TERM" : false,
     // Themes


@@ -27,8 +29,8 @@
     // Autocomplete history file name
     "HISTORY_FILENAME" : "completer.hist",
     // Image config
     // Autocomplete history file name
     "HISTORY_FILENAME" : "completer.hist",
     // Image config

-    "IMAGE_SHIFT" : 10,
-    "IMAGE_MAX_HEIGHT" : 40,
+    "IMAGE_SHIFT" : 2,
+    "IMAGE_MAX_HEIGHT" : 90,

     // Stream config
     "USER_DOMAIN" : "userstream.twitter.com",
     "PUBLIC_DOMAIN" : "stream.twitter.com",
     // Stream config
     "USER_DOMAIN" : "userstream.twitter.com",
     "PUBLIC_DOMAIN" : "stream.twitter.com",

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 133a31e9e65ee4bbb9e6053fde812a2d9ecff903..f1504ac1211b40c616c61e9d606226d7496473d7 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -41,16 +41,6 @@ def parse_arguments():
         '-to',
         '--timeout',
         help='Timeout for the stream (seconds).')
         '-to',
         '--timeout',
         help='Timeout for the stream (seconds).')

-    parser.add_argument(
-        '-ht',
-        '--heartbeat-timeout',
-        help='Set heartbeat timeout.',
-        default=90)
-    parser.add_argument(
-        '-nb',
-        '--no-block',
-        action='store_true',
-        help='Set stream to non-blocking.')

     parser.add_argument(
         '-tt',
         '--track-keywords',
     parser.add_argument(
         '-tt',
         '--track-keywords',


@@ -1692,8 +1682,8 @@ def stream(domain, args, name='Rainbow Stream'):
     # These arguments are optional:
     stream_args = dict(
         timeout=0.5,  # To check g['stream_stop'] after each 0.5 s
     # These arguments are optional:
     stream_args = dict(
         timeout=0.5,  # To check g['stream_stop'] after each 0.5 s

-        block=not args.no_block,
-        heartbeat_timeout=args.heartbeat_timeout)
+        block=True,
+        heartbeat_timeout=c['HEARTBEAT_TIMEOUT'] * 60)

     # Track keyword
     query_args = dict()
     if args.track_keywords:
     # Track keyword
     query_args = dict()
     if args.track_keywords:


@@ -1725,6 +1715,15 @@ def stream(domain, args, name='Rainbow Stream'):
                     break
             elif tweet is HeartbeatTimeout:
                 printNicely("-- Heartbeat Timeout --")
                     break
             elif tweet is HeartbeatTimeout:
                 printNicely("-- Heartbeat Timeout --")

+                guide = light_magenta("You can use ") + \
+                    light_green("switch") + \
+                    light_magenta(" command to return to your stream.\n")
+                guide += light_magenta("Type ") + \
+                    light_green("h stream") + \
+                    light_magenta(" for more details.")
+                printNicely(guide)
+                sys.stdout.write(g['decorated_name'](c['PREFIX']))
+                sys.stdout.flush()

             elif tweet is Hangup:
                 printNicely("-- Hangup --")
             elif tweet.get('text'):
             elif tweet is Hangup:
                 printNicely("-- Hangup --")
             elif tweet.get('text'):

diff --git a/setup.py b/setup.py
index 2acfb8200b63dccef2913b85703ac2c845b5a7b1..b81a321bf8a5018411007bdef3ab3613402e71cf 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
 import os.path
 
 # Bumped version

-version = '0.7.3'
+version = '0.7.4'

 
 # Require
 install_requires = [
 
 # Require
 install_requires = [