Merge lp:~jpds/ubuntu-bots/bugs-via-launchpad-api into lp:~tsimpson/ubuntu-bots/tweak

[Jonathan Davies]

[Jonathan Davies (jpds)]

Added Launchpad API support to Bugtracker.

[lp:~jpds/ubuntu-bots/bugs-via-launchpad-api]

155. By Jonathan Davies on 2010-01-24

Removed old Launchpad bug snarfing code.

156. By Jonathan Davies on 2010-01-24

Removed debug code.

157. By Jonathan Davies on 2010-01-24

Allow reading data from bug 1 on Launchpad (this is cached).

158. By Jonathan Davies on 2010-01-24

Read task data of a bug from the last task.

159. By Jonathan Davies on 2010-01-24

Really catch private bugs.

160. By Jonathan Davies on 2010-01-24

Catch bugs with more than one task and report the number of tasks.

161. By Jonathan Davies on 2010-01-24

Improved wording of more projects reply.

162. By Jonathan Davies on 2010-01-24

Display how many users a bug affects.

163. By Jonathan Davies on 2010-01-24

Report how many duplicates a bug report has.

164. By Jonathan Davies on 2010-01-24

Added a : here.

165. By Jonathan Davies on 2010-02-04

Bugtracker/plugin.py: Don't import commands - not used.

166. By Jonathan Davies on 2010-02-05

Fall back to auth'ed API login if login_anonymously is not available.

167. By Jonathan Davies on 2010-02-05

Catch AttributeError instead.

168. By Jonathan Davies on 2010-03-30

Display bug heat stuff.

[Terence Simpson (tsimpson)]

I'm marking as rejected only because the original feature is now already implemented and so there's no need to attempt a merge.

review: Disapprove (belated)

Unmerged revisions

168. By Jonathan Davies on 2010-03-30

Display bug heat stuff.

167. By Jonathan Davies on 2010-02-05

Catch AttributeError instead.

166. By Jonathan Davies on 2010-02-05

Fall back to auth'ed API login if login_anonymously is not available.

165. By Jonathan Davies on 2010-02-04

Bugtracker/plugin.py: Don't import commands - not used.

164. By Jonathan Davies on 2010-01-24

Added a : here.

163. By Jonathan Davies on 2010-01-24

Report how many duplicates a bug report has.

162. By Jonathan Davies on 2010-01-24

Display how many users a bug affects.

161. By Jonathan Davies on 2010-01-24

Improved wording of more projects reply.

160. By Jonathan Davies on 2010-01-24

Catch bugs with more than one task and report the number of tasks.

159. By Jonathan Davies on 2010-01-24

Really catch private bugs.

=== modified file 'Bugtracker/plugin.py'
--- Bugtracker/plugin.py	2009-11-30 19:04:54 +0000
+++ Bugtracker/plugin.py	2010-03-30 21:47:24 +0000
@@ -1,5 +1,6 @@
 ###
 # Copyright (c) 2005-2007 Dennis Kaarsemaker
+# Copyright (C) 2010 Jonathan Davies
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -21,12 +22,23 @@
 import supybot.registry as registry
 import supybot.schedule as schedule
 
-import re, os, time, imaplib, commands
+import re, os, time, imaplib
 import xml.dom.minidom as minidom
 from htmlentitydefs import entitydefs as entities
 import email.FeedParser
 import SOAPpy
 
+# Launchpad bindings.
+from launchpadlib.launchpad import Launchpad
+cachedir = os.path.expanduser("~/.launchpadlib/cache/")
+
+try:
+    launchpad = Launchpad.login_anonymously('Supybot: Bugtracker plugin', 'edge',
+        cachedir)
+except AttributeError:
+    launchpad = Launchpad.login_with('Supybot: Bugtracker plugin', 'edge',
+        cachedir)
+
 bad_words = ["fuck","fuk","fucking","fuking","fukin","fuckin","fucked","fuked","fucker","shit","cunt","bastard","nazi","nigger","nigga","cock","bitches","bitch"]
 
 def makeClean(s):
@@ -372,9 +384,6 @@
         else:
             for bugid in bugids:
                 bugid = int(bugid)
-                if bugid == 1 and tracker == self.db["lp"]:
-                    irc.reply("https://bugs.launchpad.net/ubuntu/+bug/1 (Not reporting large bug)")
-                    continue
                 try:
                     report = self.get_bug(msg.args[0],tracker,bugid,self.registryValue('showassignee', msg.args[0]))
                 except BugNotFoundError:
@@ -582,68 +591,60 @@
         return [(id, component, title, severity, status, assignee, "%s/show_bug.cgi?id=%d" % (self.url, id))]
 
 class Launchpad(IBugtracker):
-    def _parse(self, task):
-        parser = email.FeedParser.FeedParser()
-        parser.feed(task)
-        return parser.close()
-    def _sort(self, task1, task2):
-        # Status sort: 
-        try:
-            statuses   = ['Rejected', 'Fix Released', 'Fix Committed', 'Unconfirmed','Needs Info','Confirmed','In Progress']
-            severities = ['Undecided', 'Wishlist', 'Minor', 'Low', 'Normal', 'Medium', 'Major', 'High', 'Critical']
-            if task1['status'] not in statuses and task2['status'] in statuses: return -1
-            if task1['status'] in statuses and task2['status'] not in statuses: return 1
-            if task1['importance'] not in severities and task2['importance'] in severities: return -1
-            if task1['importance'] in severities and task2['importance'] not in severities: return 1
-            if not (task1['status'] == task2['status']):
-                if statuses.index(task1['status']) < statuses.index(task2['status']):
-                    return -1
-                return 1
-            if not (task1['importance'] == task2['importance']):
-                if severities.index(task1['importance']) < severities.index(task2['importance']):
-                    return -1
-                return 1
-        except: # Launchpad changed again?
-            return 0
-        return 0
     def get_bug(self, id):
         try:
-#            print("%s/bugs/%d/+text" % (self.url,id))
-            bugdata = utils.web.getUrl("%s/bugs/%d/+text" % (self.url,id))
-        except Exception, e:
-            if '404' in str(e):
-                raise BugNotFoundError
-            s = 'Could not parse data returned by %s: %s (%s/bugs/%d)' % (self.description, e, self.url, id)
-            raise BugtrackerError, s
-        summary = {}
-        # Trap private bugs
-        if "<!-- 4a. didn't try to log in last time: -->" in bugdata:
-            raise BugtrackerError, "This bug is private"
+            #print "Looking up bug #%s..." % id
+            bug_data = launchpad.bugs[int(id)]
+        except KeyError:
+            raise BugtrackerError, "Bug #%s not found." % id
+        except:
+            print Exception.message
+
         try:
-            # Split bug data into separate pieces (bug data, task data)
-            data     =  bugdata.split('\n\n')
-            bugdata  = data[0]
-            taskdata = data[1:]
-            parser   = email.FeedParser.FeedParser()
-            parser.feed(bugdata)
-            bugdata = parser.close()
-            taskdata = map(self._parse, taskdata)
-            taskdata.sort(self._sort)
-            taskdata = taskdata[-1]
-                
-        except Exception, e:
-            s = 'Could not parse data returned by %s: %s (%s/bugs/%d)' % (self.description, e, self.url, id)
-            raise BugtrackerError, s
+            bug_data.private
+        except:
+            raise BugtrackerError, "Bug #%s is private." % id
+
+        bug_title = bug_data.title
+        people_affected = bug_data.users_affected_count_with_dupes
+        bug_tasks_number = len(bug_data.bug_tasks) - 1
+        # Read task data from last task.
+        bug_task = list(bug_data.bug_tasks)[bug_tasks_number]
+        bug_project = bug_task.bug_target_name
+        bug_importance = bug_task.importance
+        bug_status = bug_task.status
+        bug_assignee = ""
+        bug_duplicates = len(bug_data.duplicates)
+        bug_heat = bug_data.heat
+
+        if bug_task.assignee:
+            bug_assignee = bug_task.assignee.name
+
+        if bug_tasks_number > 0:
+            if bug_tasks_number == 1:
+                bug_project += " (and %d other project)" % bug_tasks_number
+            else:
+                bug_project += " (and %d other projects)" % bug_tasks_number
+
         # Try and find duplicates
-        t = taskdata['task']
-        if '(' in t:
-            t = t[:t.rfind('(') -1]
-        if bugdata['duplicate-of']:
-            dupbug = self.get_bug(int(bugdata['duplicate-of']))
-            return [(id, t, bugdata['title'] + (' (dup-of: %d)' % dupbug[0][0]), taskdata['importance'], 
-                    taskdata['status'], taskdata['assignee'], "%s/bugs/%s" % (self.url, id))] + dupbug
-        return [(id, t, bugdata['title'], taskdata['importance'], 
-                taskdata['status'], taskdata['assignee'], "%s/bugs/%s" % (self.url, id))]
+        if bug_data.duplicate_of is not None:
+            dup_bug = launchpad.bugs[id].duplicate_of
+            return [(id, bug_project,
+                    bug_title + (' (dup-of: %d)' % dup_bug.id), bug_importance,
+                    bug_status, bug_assignee,
+                    "%s/bugs/%s" % (self.url, id))] + self.get_bug(dup_bug.id)
+
+        if people_affected > 0:
+            bug_title += " (affects: %d)" % people_affected
+
+        if bug_duplicates > 0:
+            bug_title += " (dups: %d)" % bug_duplicates
+
+        if bug_heat != 0:
+            bug_title += " (heat: %d)" % bug_heat
+
+        return [(id, bug_project, bug_title, bug_importance, bug_status,
+            bug_assignee, "%s/bugs/%s" % (self.url, id))]
             
 # <rant>
 # Debbugs sucks donkeyballs