Add support for specifying my_activity.py list format.

my_activity.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Get stats about your activity.
 
 Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
@@ skipping 691 matching lines @@
       print "Failed to import WebKit committer list, skipping WebKit checks."
       self.webkit_repo = None
       return
 
     if not webkit_account(self.user):
       email = self.user + "@chromium.org"
       print "No %s in committers.py, skipping WebKit checks." % email
       self.webkit_repo = None
 
   @staticmethod
-  def print_change(change):
-    print '%s %s' % (

[cjhopman, 2012/12/17 23:03:51]

Could this use string.format() instead of %?

[nyquist, 2012/12/19 07:08:11]

Done.

-        change['review_url'],
-        change['header'],
-        )
+  def print_change(change, output_format):
+    print output_format % {
+      'title': change['header'],
+      'url': change['review_url']
+    }
 
   @staticmethod
-  def print_issue(issue):
-    print '%s %s' % (
-        issue['url'],
-        issue['header'],
-        )
+  def print_issue(issue, output_format):

[cjhopman, 2012/12/17 23:08:27]

To ensure that the different formatters are always called with dicts with the
same set of keys, maybe have each of these functions call another with the
arguments that the formatters expect.

[nyquist, 2012/12/19 07:08:11]

Done.

+    print output_format % {
+      'title': issue['header'],
+      'url': issue['url'],
+    }
 
   def filter_issue(self, issue, should_filter_by_user=True):
     def maybe_filter_username(email):
       return not should_filter_by_user or username(email) == self.user
     if (maybe_filter_username(issue['author']) and
         self.filter_modified(issue['created'])):
       return True
     if (maybe_filter_username(issue['owner']) and
         (self.filter_modified(issue['created']) or
          self.filter_modified(issue['modified']))):
@@ skipping 32 matching lines @@
     for instance in gerrit_instances:
       self.changes += self.gerrit_search(instance, owner=self.user)
 
     for instance in git_instances:
       self.changes += self.git_search(instance, owner=self.user)
 
   def print_changes(self):
     if self.changes:
       print '\nChanges:'
       for change in self.changes:
-        self.print_change(change)
+        self.print_change(change, self.options.output_format)
 
   def get_reviews(self):
     for instance in rietveld_instances:
       self.reviews += self.rietveld_search(instance, reviewer=self.user)
 
     for instance in gerrit_instances:
       reviews = self.gerrit_search(instance, reviewer=self.user)
       reviews = filter(lambda r: not username(r['owner']) == self.user, reviews)
       self.reviews += reviews
 
     for instance in git_instances:
       self.reviews += self.git_search(instance, reviewer=self.user)
 
   def print_reviews(self):
     if self.reviews:
       print '\nReviews:'
       for review in self.reviews:
-        self.print_change(review)
+        self.print_change(review, self.options.output_format)
 
   def get_issues(self):
     for project in google_code_projects:
       self.issues += self.google_code_issue_search(project)
 
     for instance in bugzilla_instances:
       self.issues += self.bugzilla_issues(instance, self.user)
 
   def process_activities(self):
     # If a webkit bug was a review, don't list it as an issue.
     ids = {}
     for review in self.reviews + self.changes:
       if 'webkit_bug_id' in review:
         ids[review['webkit_bug_id']] = True
 
     def duplicate_issue(issue):
       if 'webkit_bug_id' not in issue:
         return False
       return issue['webkit_bug_id'] in ids
 
     self.issues = filter(lambda issue: not duplicate_issue(issue), self.issues)
 
   def print_issues(self):
     if self.issues:
       print '\nIssues:'
       for c in self.issues:
-        self.print_issue(c)
+        self.print_issue(c, self.options.output_format)
 
   def print_activity(self):
     self.print_changes()
     self.print_reviews()
     self.print_issues()
 
 
 def main():
   # Silence upload.py.
   rietveld.upload.verbosity = 0
@@ skipping 22 matching lines @@
   parser.add_option(
       '-Y', '--this_year', action='store_true',
       help='Use this year\'s dates')
   parser.add_option(
       '-w', '--week_of', metavar='<date>',
       help='Show issues for week of the date')
   parser.add_option(
       '-a', '--auth',
       action='store_true',
       help='Ask to authenticate for instances with no auth cookie')
-
+  parser.add_option(
+      '-f', '--output_format',
+      dest='output_format', metavar='<format>',
+      default='%(url)s %(title)s',
+      help='Specifies the format to use when printing your activity.'
+           ' Uses standard Python string formatting and defaults to:'
+           ' %(url)s %(title)s')

[cjhopman, 2012/12/17 23:08:27]

Should the help also specify what named arguments are available to the format
string?

[nyquist, 2012/12/19 07:08:11]

Done.

   group = optparse.OptionGroup(parser, 'Activity Types',
                                'By default, all activity will be looked up and '
                                'printed. If any of these are specified, only '
                                'those specified will be searched.')
   group.add_option(
       '-c', '--changes',
       action='store_true',
       help='Show changes.')
   group.add_option(
       '-i', '--issues',
@@ skipping 68 matching lines @@
   print '\n\n\n'
 
   my_activity.print_changes()
   my_activity.print_reviews()
   my_activity.print_issues()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())