Simplify further. New args to example script. Update documentation.

[z_archive/twitter.git] / twitter / stream_example.py

diff --git a/twitter/stream_example.py b/twitter/stream_example.py
index 5f2dbdf5d80ee97acfe4d1cfe38a862e21f9574a..1aca313015dc211644e83e657192eaf9d1f58234 100644 (file)
--- a/twitter/stream_example.py
+++ b/twitter/stream_example.py
@@ -12,7 +12,7 @@ from __future__ import print_function
 
 import argparse
 
-from twitter.stream import TwitterStream
+from twitter.stream import TwitterStream, Timeout
 from twitter.oauth import OAuth
 from twitter.util import printNicely
 
@@ -22,41 +22,48 @@ def parse_arguments():
     parser = argparse.ArgumentParser()
 
     parser.add_argument('-t',  '--token', help='The Twitter Access Token.')
-    parser.add_argument('-ts', '--token_secret', help='The Twitter Access Token Secret.')
-    parser.add_argument('-ck', '--consumer_key', help='The Twitter Consumer Key.')
-    parser.add_argument('-cs', '--consumer_secret', help='The Twitter Consumer Secret.')
-    parser.add_argument('-us', '--user_stream', action='store_true', help='Connect to the user stream endpoint.')
-    parser.add_argument('-ss', '--site_stream', action='store_true', help='Connect to the site stream endpoint.')
-
+    parser.add_argument('-ts', '--token-secret', help='The Twitter Access Token Secret.')
+    parser.add_argument('-ck', '--consumer-key', help='The Twitter Consumer Key.')
+    parser.add_argument('-cs', '--consumer-secret', help='The Twitter Consumer Secret.')
+    parser.add_argument('-us', '--user-stream', action='store_true', help='Connect to the user stream endpoint.')
+    parser.add_argument('-ss', '--site-stream', action='store_true', help='Connect to the site stream endpoint.')
+    parser.add_argument('-to', '--timeout', help='Timeout for the stream (seconds)')
+    parser.add_argument('-nb', '--no-block', action='store_true', help='Set stream to non-blocking')
+    parser.add_argument('-tt', '--track', help='Search the stream for specific text')
     return parser.parse_args()
 
-##  parse_arguments()
-
-
 def main():
-
     args = parse_arguments()
 
+    if not all((args.token, args.token_secret, args.consumer_key, args.consumer_secret)):
+        print(__doc__)
+        return 2
+
     # When using twitter stream you must authorize.
     auth = OAuth(args.token, args.token_secret, args.consumer_key, args.consumer_secret)
     if args.user_stream:
-        stream = TwitterStream(auth=auth, domain='userstream.twitter.com')
+        stream = TwitterStream(auth=auth, domain='userstream.twitter.com', timeout=args.timeout, block=not args.no_block)
         tweet_iter = stream.user()
     elif args.site_stream:
         stream = TwitterStream(auth=auth, domain='sitestream.twitter.com')
         tweet_iter = stream.site()
     else:
         stream = TwitterStream(auth=auth)
-        tweet_iter = stream.statuses.sample()
+        if args.track:
+            tweet_iter = stream.statuses.filter(track=args.track)
+        else:
+            tweet_iter = stream.statuses.sample()
 
     # Iterate over the sample stream.
     for tweet in tweet_iter:
         # You must test that your tweet has text. It might be a delete
         # or data message.
-        if tweet.get('text'):
+        if tweet is None:
+            printNicely("-- None --")
+        elif tweet is Timeout:
+            printNicely("-- Timeout --")
+        elif tweet.get('text'):
             printNicely(tweet['text'])
 
-##  main()
-
 if __name__ == '__main__':
     main()