X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/95d498009eca0a9e179a14eec05e7e3738a72bfb..11534bd21fb1b4ab6647ba8d2430549bcdedbc25:/twitter/stream_example.py

diff --git a/twitter/stream_example.py b/twitter/stream_example.py
index d90a424..2888ace 100644
--- a/twitter/stream_example.py
+++ b/twitter/stream_example.py
@@ -25,28 +25,36 @@ def parse_arguments():
     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.')
 
     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.
-    stream = TwitterStream(auth=OAuth(args.token, args.token_secret, args.consumer_key, args.consumer_secret))
+    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')
+        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, timeout=60.0)
+        tweet_iter = stream.statuses.sample()
 
     # Iterate over the sample stream.
-    tweet_iter = stream.statuses.sample()
     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'):
             printNicely(tweet['text'])
 
-##  main()
-
 if __name__ == '__main__':
     main()