Add a simple prompt thing to twitter cmdline.

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

diff --git a/twitter/cmdline.py b/twitter/cmdline.py
index 21c26c9e7b22b558300f6c7fc049b5b4676b0fe4..3162f1c489be6c1646c947b9d2817ef480793d6f 100644 (file)
--- a/twitter/cmdline.py
+++ b/twitter/cmdline.py
@@ -1,3 +1,4 @@
+# encoding: utf-8

 """
 USAGE:
 
 """
 USAGE:
 


@@ -6,15 +7,19 @@ USAGE:
 
 ACTIONS:
  authorize      authorize the command-line tool to interact with Twitter
 
 ACTIONS:
  authorize      authorize the command-line tool to interact with Twitter

- follow         add the specified user to your follow list
+ follow         follow a user

  friends        get latest tweets from your friends (default action)
  help           print this help text that you are currently reading
  friends        get latest tweets from your friends (default action)
  help           print this help text that you are currently reading

- leave          remove the specified user from your following list
+ leave          stop following a user
+ list           get list of a user's lists; give a list name to get
+                    tweets from that list
+ mylist         get list of your lists; give a list name to get tweets
+                    from that list

  public         get latest public tweets
  public         get latest public tweets

- replies        get latest replies
+ replies        get latest replies to you

  search         search twitter (Beware: octothorpe, escape it)
  set            set your twitter status
  search         search twitter (Beware: octothorpe, escape it)
  set            set your twitter status

- shell          login the twitter shell
+ shell          login to the twitter shell

 
 
 OPTIONS:
 
 
 OPTIONS:


@@ -28,8 +33,8 @@ OPTIONS:
  -l --length <count>        specify number of status updates shown
                             (default: 20, max: 200)
  -t --timestamp             show time before status lines
  -l --length <count>        specify number of status updates shown
                             (default: 20, max: 200)
  -t --timestamp             show time before status lines

- -d --datestamp             shoe date before status lines
-    --no-ssl                use HTTP instead of more secure HTTPS
+ -d --datestamp             show date before status lines
+    --no-ssl                use less-secure HTTP instead of HTTPS

     --oauth <filename>      filename to read/store oauth credentials to
 
 FORMATS for the --format option
     --oauth <filename>      filename to read/store oauth credentials to
 
 FORMATS for the --format option


@@ -69,8 +74,10 @@ from urllib import quote
 import webbrowser
 
 from api import Twitter, TwitterError
 import webbrowser
 
 from api import Twitter, TwitterError

-from oauth import OAuth
+from oauth import OAuth, write_token_file, read_token_file
+from oauth_dance import oauth_dance

 import ansi
 import ansi

+from util import smrt_input

 
 OPTIONS = {
     'action': 'friends',
 
 OPTIONS = {
     'action': 'friends',


@@ -89,10 +96,10 @@ OPTIONS = {
 
 def parse_args(args, options):
     long_opts = ['help', 'format=', 'refresh', 'oauth=',
 
 def parse_args(args, options):
     long_opts = ['help', 'format=', 'refresh', 'oauth=',

-                 'refresh-rate=', 'config=', 'length=', 'timestamp', 
+                 'refresh-rate=', 'config=', 'length=', 'timestamp',

                  'datestamp', 'no-ssl']
     short_opts = "e:p:f:h?rR:c:l:td"
                  'datestamp', 'no-ssl']
     short_opts = "e:p:f:h?rR:c:l:td"

-    opts, extra_args = getopt(args, short_opts, long_opts)        
+    opts, extra_args = getopt(args, short_opts, long_opts)

 
     for opt, arg in opts:
         if opt in ('-f', '--format'):
 
     for opt, arg in opts:
         if opt in ('-f', '--format'):


@@ -136,7 +143,7 @@ def get_time_string(status, options, format="%a %b %d %H:%M:%S +0000 %Y"):
         return time.strftime("%H:%M:%S ", t)
     elif datestamp:
         return time.strftime("%Y-%m-%d ", t)
         return time.strftime("%H:%M:%S ", t)
     elif datestamp:
         return time.strftime("%Y-%m-%d ", t)

-    return ""                             
+    return ""

 
 class StatusFormatter(object):
     def __call__(self, status, options):
 
 class StatusFormatter(object):
     def __call__(self, status, options):


@@ -169,6 +176,31 @@ class URLStatusFormatter(object):
         urls = self.urlmatch.findall(status['text'])
         return u'\n'.join(urls) if urls else ""
 
         urls = self.urlmatch.findall(status['text'])
         return u'\n'.join(urls) if urls else ""
 

+
+class ListsFormatter(object):
+    def __call__(self, list):
+        if list['description']:
+            list_str = u"%-30s (%s)" % (list['name'], list['description'])
+        else:
+            list_str = u"%-30s" % (list['name'])
+        return u"%s\n" % list_str
+
+class ListsVerboseFormatter(object):
+    def __call__(self, list):
+        list_str = u"%-30s\n description: %s\n members: %s\n mode:%s\n" % (list['name'], list['description'], list['member_count'], list['mode'])
+        return list_str
+
+class AnsiListsFormatter(object):
+    def __init__(self):
+        self._colourMap = ansi.ColourMap()
+
+    def __call__(self, list):
+        colour = self._colourMap.colourFor(list['name'])
+        return (u"%s%-15s%s %s" %(
+            ansi.cmdColour(colour), list['name'],
+            ansi.cmdReset(), list['description']))
+
+

 class AdminFormatter(object):
     def __call__(self, action, user):
         user_str = u"%s (%s)" %(user['screen_name'], user['name'])
 class AdminFormatter(object):
     def __call__(self, action, user):
         user_str = u"%s (%s)" %(user['screen_name'], user['name'])


@@ -211,6 +243,17 @@ class AnsiSearchFormatter(object):
             ansi.cmdColour(colour), result['from_user'],
             ansi.cmdReset(), result['text']))
 
             ansi.cmdColour(colour), result['from_user'],
             ansi.cmdReset(), result['text']))
 

+_term_encoding = None
+def get_term_encoding():
+    global _term_encoding
+    if not _term_encoding:
+        lang = os.getenv('LANG', 'unknown.UTF-8').split('.')
+        if lang[1:]:
+            _term_encoding = lang[1]
+        else:
+            _term_encoding = 'UTF-8'
+    return _term_encoding
+

 formatters = {}
 status_formatters = {
     'default': StatusFormatter,
 formatters = {}
 status_formatters = {
     'default': StatusFormatter,


@@ -236,6 +279,14 @@ search_formatters = {
 }
 formatters['search'] = search_formatters
 
 }
 formatters['search'] = search_formatters
 

+lists_formatters = {
+    'default': ListsFormatter,
+    'verbose': ListsVerboseFormatter,
+    'urls': None,
+    'ansi': AnsiListsFormatter
+}
+formatters['lists'] = lists_formatters
+

 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)
     if (not formatters_dict):
 def get_formatter(action_type, options):
     formatters_dict = formatters.get(action_type)
     if (not formatters_dict):


@@ -299,7 +350,7 @@ class NoSuchAction(Action):
     def __call__(self, twitter, options):
         raise NoSuchActionError("No such action: %s" %(options['action']))
 
     def __call__(self, twitter, options):
         raise NoSuchActionError("No such action: %s" %(options['action']))
 

-def printNicely(string):        
+def printNicely(string):

     if sys.stdout.encoding:
         print string.encode(sys.stdout.encoding, 'replace')
     else:
     if sys.stdout.encoding:
         print string.encode(sys.stdout.encoding, 'replace')
     else:


@@ -319,12 +370,14 @@ class SearchAction(Action):
         # We need to be pointing at search.twitter.com to work, and it is less
         # tangly to do it here than in the main()
         twitter.domain="search.twitter.com"
         # We need to be pointing at search.twitter.com to work, and it is less
         # tangly to do it here than in the main()
         twitter.domain="search.twitter.com"

+        twitter.uriparts=()

         # We need to bypass the TwitterCall parameter encoding, so we
         # don't encode the plus sign, so we have to encode it ourselves
         # We need to bypass the TwitterCall parameter encoding, so we
         # don't encode the plus sign, so we have to encode it ourselves

-        query_string = "+".join([quote(term) for term in options['extra_args']])
-        twitter.encoded_args = "q=%s" %(query_string)
+        query_string = "+".join(
+            [quote(term.decode(get_term_encoding()))
+             for term in options['extra_args']])

 
 

-        results = twitter.search()['results']
+        results = twitter.search(q=query_string)['results']

         f = get_formatter('search', options)
         for result in results:
             resultStr = f(result, options)
         f = get_formatter('search', options)
         for result in results:
             resultStr = f(result, options)


@@ -349,6 +402,33 @@ class AdminAction(Action):
         else:
             printNicely(af(options['action'], user))
 
         else:
             printNicely(af(options['action'], user))
 

+class ListsAction(StatusAction):
+    def getStatuses(self, twitter, options):
+        if not options['extra_args']:
+            raise TwitterError("Please provide a user to query for lists")
+
+        screen_name = options['extra_args'][0]
+
+        if not options['extra_args'][1:]:
+            lists = twitter.user.lists(user=screen_name)['lists']
+            if not lists:
+                printNicely("This user has no lists.")
+            for list in lists:
+                lf = get_formatter('lists', options)
+                printNicely(lf(list))
+            return []
+        else:
+            return reversed(twitter.user.lists.list.statuses(
+                    user=screen_name, list=options['extra_args'][1]))
+
+
+class MyListsAction(ListsAction):
+    def getStatuses(self, twitter, options):
+        screen_name = twitter.account.verify_credentials()['screen_name']
+        options['extra_args'].insert(0, screen_name)
+        return ListsAction.getStatuses(self, twitter, options)
+
+

 class FriendsAction(StatusAction):
     def getStatuses(self, twitter, options):
         return reversed(twitter.statuses.friends_timeline(count=options["length"]))
 class FriendsAction(StatusAction):
     def getStatuses(self, twitter, options):
         return reversed(twitter.statuses.friends_timeline(count=options["length"]))


@@ -371,7 +451,7 @@ class LeaveAction(AdminAction):
 
 class SetStatusAction(Action):
     def __call__(self, twitter, options):
 
 class SetStatusAction(Action):
     def __call__(self, twitter, options):

-        statusTxt = (u" ".join(options['extra_args'])
+        statusTxt = (" ".join(options['extra_args']).decode(get_term_encoding())

                      if options['extra_args']
                      else unicode(raw_input("message: ")))
         status = (statusTxt.encode('utf8', 'replace'))
                      if options['extra_args']
                      else unicode(raw_input("message: ")))
         status = (statusTxt.encode('utf8', 'replace'))


@@ -424,6 +504,14 @@ class TwitterShell(Action):
                 else:
                     raise SystemExit(0)
 
                 else:
                     raise SystemExit(0)
 

+class PythonPromptAction(Action):
+    def __call__(self, twitter, options):
+        try:
+            while True:
+                smrt_input(globals(), locals())
+        except EOFError:
+            pass
+

 class HelpAction(Action):
     def __call__(self, twitter, options):
         print __doc__
 class HelpAction(Action):
     def __call__(self, twitter, options):
         print __doc__


@@ -432,57 +520,16 @@ class DoNothingAction(Action):
     def __call__(self, twitter, options):
         pass
 
     def __call__(self, twitter, options):
         pass
 

-def parse_oauth_tokens(result):
-    for r in result.split('&'):
-        k, v = r.split('=')
-        if k == 'oauth_token':
-            oauth_token = v
-        elif k == 'oauth_token_secret':
-            oauth_token_secret = v
-    return oauth_token, oauth_token_secret
-
-def oauth_dance(options):
-    print ("Hi there! We're gonna get you all set up to use Twitter"
-           " on the command-line.")
-    twitter = Twitter(
-        auth=OAuth('', '', CONSUMER_KEY, CONSUMER_SECRET),
-        format='')
-    oauth_token, oauth_token_secret = parse_oauth_tokens(
-        twitter.oauth.request_token())
-    print """
-In the web browser window that opens please choose to Allow access to the
-command-line tool. Copy the PIN number that appears on the next page and
-paste or type it here:
-"""
-    webbrowser.open(
-        'http://api.twitter.com/oauth/authorize?oauth_token=' +
-        oauth_token)
-    time.sleep(2) # Sometimes the last command can print some
-                  # crap. Wait a bit so it doesn't mess up the next
-                  # prompt.
-    oauth_verifier = raw_input("Please type the PIN: ").strip()
-    twitter = Twitter(
-        auth=OAuth(
-            oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),
-        format='')
-    oauth_token, oauth_token_secret = parse_oauth_tokens(
-        twitter.oauth.access_token(oauth_verifier=oauth_verifier))
-    oauth_file = open(options['oauth_filename'], 'w')
-    print >> oauth_file, oauth_token
-    print >> oauth_file, oauth_token_secret
-    oauth_file.close()
-    print
-    print "That's it! Your authorization keys have been written to %s." % (
-        options['oauth_filename'])
-
-

 actions = {
     'authorize' : DoNothingAction,
     'follow'    : FollowAction,
     'friends'   : FriendsAction,
 actions = {
     'authorize' : DoNothingAction,
     'follow'    : FollowAction,
     'friends'   : FriendsAction,

+    'list'      : ListsAction,
+    'mylist'    : MyListsAction,

     'help'      : HelpAction,
     'leave'     : LeaveAction,
     'public'    : PublicAction,
     'help'      : HelpAction,
     'leave'     : LeaveAction,
     'public'    : PublicAction,

+    'pyprompt'  : PythonPromptAction,

     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,
     'replies'   : RepliesAction,
     'search'    : SearchAction,
     'set'       : SetStatusAction,


@@ -499,10 +546,6 @@ def loadConfig(filename):
                 options[option] = cp.get('twitter', option)
     return options
 
                 options[option] = cp.get('twitter', option)
     return options
 

-def read_oauth_file(fn):
-    f = open(fn)
-    return f.readline().strip(), f.readline().strip()
-

 def main(args=sys.argv[1:]):
     arg_options = {}
     try:
 def main(args=sys.argv[1:]):
     arg_options = {}
     try:


@@ -512,8 +555,9 @@ def main(args=sys.argv[1:]):
         print >> sys.stderr
         raise SystemExit(1)
 
         print >> sys.stderr
         raise SystemExit(1)
 

-    config_options = loadConfig(
+    config_path = os.path.expanduser(

         arg_options.get('config_filename') or OPTIONS.get('config_filename'))
         arg_options.get('config_filename') or OPTIONS.get('config_filename'))

+    config_options = loadConfig(config_path)

 
     # Apply the various options in order, the most important applied last.
     # Defaults first, then what's read from config file, then command-line
 
     # Apply the various options in order, the most important applied last.
     # Defaults first, then what's read from config file, then command-line


@@ -529,16 +573,22 @@ def main(args=sys.argv[1:]):
         print >> sys.stderr, "Use 'twitter -h' for help."
         return 1
 
         print >> sys.stderr, "Use 'twitter -h' for help."
         return 1
 

+    oauth_filename = os.path.expanduser(options['oauth_filename'])
+

     if (options['action'] == 'authorize'
     if (options['action'] == 'authorize'

-        or not os.path.exists(options['oauth_filename'])):
-        oauth_dance(options)
+        or not os.path.exists(oauth_filename)):
+        oauth_dance(
+            "the Command-Line Tool", CONSUMER_KEY, CONSUMER_SECRET,
+            options['oauth_filename'])
+
+    oauth_token, oauth_token_secret = read_token_file(oauth_filename)

 
 

-    oauth_token, oauth_token_secret = read_oauth_file(options['oauth_filename'])
-    

     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),
     twitter = Twitter(
         auth=OAuth(
             oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET),

-        secure=options['secure'])
+        secure=options['secure'],
+        api_version='1',
+        domain='api.twitter.com')

 
     try:
         Action()(twitter, options)
 
     try:
         Action()(twitter, options)


@@ -546,6 +596,6 @@ def main(args=sys.argv[1:]):
         print >>sys.stderr, e
         raise SystemExit(1)
     except TwitterError, e:
         print >>sys.stderr, e
         raise SystemExit(1)
     except TwitterError, e:

-        print >> sys.stderr, e.args[0]
+        print >> sys.stderr, str(e)

         print >> sys.stderr, "Use 'twitter -h' for help."
         raise SystemExit(1)
         print >> sys.stderr, "Use 'twitter -h' for help."
         raise SystemExit(1)