Merge lp:~mthaddon/laika/is-sotn into lp:~elmo/laika/is-sotn

[Tom Haddon]

Update output to summarise MPs by project

Update output to summarise MPs by project.

Sample output: https://pastebin.canonical.com/p/sgM2TrNvWc/

=== modified file 'laika'
--- laika	2017-03-10 13:25:11 +0000
+++ laika	2018-12-20 08:36:08 +0000
@@ -12,6 +12,7 @@
 # GNU General Public License version 3.
 
 import ConfigParser
+from collections import Counter
 import datetime
 from optparse import OptionParser
 import os
@@ -105,7 +106,7 @@
         delta = UTCNOW - date
         return delta <= win
 
-    def print_bugid(self, task):
+    def render_bugid(self, task):
         '''Using this interface adds the bug to global bug list.'''
         ago = ""
         self.bugs[task.bug.id] = 1
@@ -123,10 +124,13 @@
             ago += ", " if ago else ""
             ago += "%d minute%s" % (minutes, "s" if minutes > 1 else "")
 
-        print " * %s" % (task.title)
+        bug_title = "%s" % (task.title)
         t = Template(self.bugpattern)
-        print "  * %s " % (t.substitute(bugid=str(task.bug.id)))
-        #print "last updated", ago, "ago"
+        bug_task_id = "%s " % (t.substitute(bugid=str(task.bug.id)))
+        return {
+            "bug_title": bug_title,
+            "bug_task_id": bug_task_id,
+            }
 
     def print_assignments(self):
         statuses = ['closed', 'fix_released', 'fix_committed',
@@ -176,19 +180,18 @@
                     break
         print
 
-    def print_reported(self):
+    def render_reported(self):
+        output = []
         tasks = self.user.searchTasks(bug_reporter=self.user,
                                       status=self.status,
                                       created_since=self.since)
         tasks = [LPWrap(t) for t in tasks]
-        #self.print_header("Reported Bugs")
         for t in tasks:
             if self.bugs.has_key(t.bug.id):
                 continue
             if self.in_window(t.bug.date_created):
-                self.print_bugid(t)
-                print
-        #print
+                output.append(self.render_bugid(t))
+        return output
 
     def print_ppa_activity(self):
         if self.ppas == '':
@@ -224,7 +227,8 @@
             print
         print
 
-    def print_merge_proposals(self):
+    def render_merge_proposals(self):
+        output = []
         for status in ["Work in progress", "Needs review", "Approved",
                        "Rejected", "Merged", "Code failed to merge", "Queued",
                        "Superseded"]:
@@ -234,7 +238,8 @@
             for mp in mps:
                 if not self.in_window(mp.date_created):
                     break
-                print " * %s" % (mp.web_link)
+                output.append("%s" % (mp.web_link))
+        return [x for x in output if x]
 
     def render(self, action="all"):
         if action == "all":
@@ -248,30 +253,36 @@
         elif action == "comments":
             self.print_comments()
         elif action == "reported":
-            self.print_reported()
+            return self.render_reported()
         elif action == "ppa_activity":
             self.print_ppa_activity()
         elif action == "merge_proposals":
-            self.print_merge_proposals()
+            return self.render_merge_proposals()
 
     def generate(self):
-        #print "= Weekly Activity Report ="
-        #print " Generated at %s" % UTCNOW
         if self.team:
             self.team = self.launchpad.people[self.team]
             members = self.team.participants
-            print "= Merge Proposals =\n"
-            for m in members:
-                if m.is_team:
-                    continue
-                self.user = m
-                self.render(action="merge_proposals")
-            print "= Bug Reports =\n"
-            for m in members:
-                if m.is_team:
-                    continue
-                self.user = m
-                self.render(action="reported")
+            merge_proposals = []
+            bug_reports = []
+            for m in members:
+                if m.is_team:
+                    continue
+                self.user = m
+                print("Processing %s" % m)
+                merge_proposals.extend(self.render(action="merge_proposals"))
+                bug_reports.extend(self.render(action="reported"))
+            print("--- Paste into SoTN below here---")
+            print("")
+            print("")
+            print("= Merge Proposals =\n")
+            project_merge_proposals = Counter([x.split('/')[4] for x in merge_proposals])
+            for i in project_merge_proposals.most_common():
+                print(" * https://launchpad.net/%s %s" % (i[0], i[1]))
+            print("= Bug Reports =\n")
+            for bug_report in bug_reports:
+                print(" * %s" % bug_report['bug_task_id'])
+                print("  * %s" % bug_report['bug_title'])
         else:
             print "== %s ==" % self.user.display_name
             self.render()