X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/1b31d642c54e09dc8f8a1ca49c934d6990f2ab33..7227ce91c18d2ee1aeddf594d95d72085559771f:/twitter/cmdline.py diff --git a/twitter/cmdline.py b/twitter/cmdline.py index 980b754..fbd6c3f 100644 --- a/twitter/cmdline.py +++ b/twitter/cmdline.py @@ -1,3 +1,4 @@ +# encoding: utf-8 """ USAGE: @@ -6,15 +7,21 @@ USAGE: 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 - 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 - replies get latest replies + pyprompt start a Python prompt for interacting with the twitter + object directly + replies get latest replies to you search search twitter (Beware: octothorpe, escape it) set set your twitter status - shell login the twitter shell + shell login to the twitter shell OPTIONS: @@ -28,8 +35,8 @@ OPTIONS: -l --length 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 to read/store oauth credentials to FORMATS for the --format option @@ -72,6 +79,7 @@ from api import Twitter, TwitterError from oauth import OAuth, write_token_file, read_token_file from oauth_dance import oauth_dance import ansi +from util import smrt_input OPTIONS = { 'action': 'friends', @@ -90,10 +98,10 @@ OPTIONS = { 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" - 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'): @@ -137,7 +145,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 "" + return "" class StatusFormatter(object): def __call__(self, status, options): @@ -170,6 +178,31 @@ class URLStatusFormatter(object): 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']) @@ -248,6 +281,14 @@ 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): @@ -311,7 +352,7 @@ class NoSuchAction(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: @@ -331,15 +372,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" - twitter.uri="" + 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 query_string = "+".join( [quote(term.decode(get_term_encoding())) for term in options['extra_args']]) - twitter.encoded_args = "q=%s" %(query_string) - results = twitter.search()['results'] + results = twitter.search(q=query_string)['results'] f = get_formatter('search', options) for result in results: resultStr = f(result, options) @@ -364,6 +404,33 @@ class AdminAction(Action): 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"])) @@ -439,6 +506,14 @@ class TwitterShell(Action): 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__ @@ -447,22 +522,16 @@ class DoNothingAction(Action): 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 - actions = { 'authorize' : DoNothingAction, 'follow' : FollowAction, 'friends' : FriendsAction, + 'list' : ListsAction, + 'mylist' : MyListsAction, 'help' : HelpAction, 'leave' : LeaveAction, 'public' : PublicAction, + 'pyprompt' : PythonPromptAction, 'replies' : RepliesAction, 'search' : SearchAction, 'set' : SetStatusAction, @@ -488,8 +557,9 @@ def main(args=sys.argv[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')) + 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 @@ -505,19 +575,22 @@ def main(args=sys.argv[1:]): print >> sys.stderr, "Use 'twitter -h' for help." return 1 + oauth_filename = os.path.expanduser(options['oauth_filename']) + if (options['action'] == 'authorize' - or not os.path.exists(options['oauth_filename'])): + 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(options['oauth_filename']) - + oauth_token, oauth_token_secret = read_token_file(oauth_filename) + twitter = Twitter( auth=OAuth( oauth_token, oauth_token_secret, CONSUMER_KEY, CONSUMER_SECRET), secure=options['secure'], - api_version='1') + api_version='1', + domain='api.twitter.com') try: Action()(twitter, options) @@ -525,6 +598,6 @@ def main(args=sys.argv[1:]): 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)