Merge lp:~brian-murray/merge-o-matic/linkify-uploader into lp:merge-o-matic

[Brian Murray]

Use urlopen and json parsing to look up the Launchpad account associated with an email address so that we can then link to the uploaders Launchpad page.

[lp:~brian-murray/merge-o-matic/linkify-uploader]

245. By Brian Murray on 2015-07-07

also update manual-status.py to linkify the uploader's name / email address.

246. By Brian Murray on 2015-07-07

fix number of blank lines.

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~brian-murray/merge-o-matic/linkify-uploader]

247. By Brian Murray on 2015-07-07

move get_person_lp_page to momlib.py, address reviewer feedback

[Colin Watson (cjwatson)]

review: Approve

[Brian Murray (brian-murray)]

On Wed, Jul 08, 2015 at 04:00:31PM -0000, Colin Watson wrote:
> Review: Approve
>
>
>
> Diff comments:
>
> > === modified file 'manual-status.py'
> > --- manual-status.py 2013-12-25 22:01:26 +0000
> > +++ manual-status.py 2015-07-07 21:29:21 +0000
> > @@ -244,23 +244,31 @@
> > for uploaded, priority, package, user, uploader, source, \
> > left_version, right_version in merges:
> > if user is not None:
> > - who = user
> > - who = who.replace("&", "&")
> > - who = who.replace("<", "&lt;")
> > - who = who.replace(">", "&gt;")
> > + (usr_name, usr_mail) = parseaddr(user)
> > + user_lp_page = get_person_lp_page(usr_mail)
> > + user = user.replace("&", "&amp;")
> > + user = user.replace("<", "&lt;")
> > + user = user.replace(">", "&gt;")
> > + if user_lp_page:
> > + who = "<a href='%s'>%s</a>" % (user_lp_page.encode("utf-8"), user)
> > + else:
> > + who = "%s" % user
>
> user is already a string, so no need for the format operator here.

Fixed.

> >
> > if uploader is not None:
> > - (usr_name, usr_mail) = parseaddr(user)
> > (upl_name, upl_mail) = parseaddr(uploader)
> > + upl_lp_page = get_person_lp_page(upl_mail)
> >
> > if len(usr_name) and usr_name != upl_name:
> > u_who = uploader
> > u_who = u_who.replace("&", "&amp;")
> > u_who = u_who.replace("<", "&lt;")
> > u_who = u_who.replace(">", "&gt;")
> > -
> > - who = "%s<br><small><em>Uploader:</em> %s</small>" \
> > - % (who, u_who)
> > + if upl_lp_page:
> > + who = "%s<br><small><em>Uploader:</em> <a href='%s'>%s</a></small>" \
> > + % (who, upl_lp_page.encode("utf-8"), u_who)
> > + else:
> > + who = "%s<br><small><em>Uploader:</em> %s</small>" \
> > + % (who, u_who)
> > else:
> > who = "&nbsp;"
> >
> > === modified file 'merge-status.py'
> > --- merge-status.py 2013-08-02 10:09:52 +0000
> > +++ merge-status.py 2015-07-07 21:29:21 +0000
> > @@ -266,23 +266,31 @@
> > for uploaded, priority, package, user, uploader, source, \
> > base_version, left_version, right_version in merges:
> > if user is not None:
> > - who = user
> > - who = who.replace("&", "&amp;")
> > - who = who.replace("<", "&lt;")
> > - who = who.replace(">", "&gt;")
> > + (usr_name, usr_mail) = parseaddr(user)
> > + user_lp_page = get_person_lp_page(usr_mail)
> > + user = user.replace("&", "&amp;")
> > + user = user.replace("<", "&lt;")
> > + user = user.replace(">", "&gt;")
> > + if user_lp_page:
> > + who = "<a href='%s'>%s</a>" % (user_lp_page.encode("utf-8"), user)
> > + else:
> > + who = "%s"...

[lp:~brian-murray/merge-o-matic/linkify-uploader]

248. By Brian Murray on 2015-07-08

address cjwaton's feedback and document get_person_lp_page

=== modified file 'manual-status.py'
--- manual-status.py	2013-12-25 22:01:26 +0000
+++ manual-status.py	2015-07-08 16:40:28 +0000
@@ -244,23 +244,31 @@
     for uploaded, priority, package, user, uploader, source, \
             left_version, right_version in merges:
         if user is not None:
-            who = user
-            who = who.replace("&", "&")
-            who = who.replace("<", "&lt;")
-            who = who.replace(">", "&gt;")
+            (usr_name, usr_mail) = parseaddr(user)
+            user_lp_page = get_person_lp_page(usr_mail)
+            user = user.replace("&", "&amp;")
+            user = user.replace("<", "&lt;")
+            user = user.replace(">", "&gt;")
+            if user_lp_page:
+                who = "<a href='%s'>%s</a>" % (user_lp_page.encode("utf-8"), user)
+            else:
+                who = user
 
             if uploader is not None:
-                (usr_name, usr_mail) = parseaddr(user)
                 (upl_name, upl_mail) = parseaddr(uploader)
+                upl_lp_page = get_person_lp_page(upl_mail)
 
                 if len(usr_name) and usr_name != upl_name:
                     u_who = uploader
                     u_who = u_who.replace("&", "&amp;")
                     u_who = u_who.replace("<", "&lt;")
                     u_who = u_who.replace(">", "&gt;")
-
-                    who = "%s<br><small><em>Uploader:</em> %s</small>" \
-                            % (who, u_who)
+                    if upl_lp_page:
+                        who = "%s<br><small><em>Uploader:</em> <a href='%s'>%s</a></small>" \
+                                % (who, upl_lp_page.encode("utf-8"), u_who)
+                    else:
+                        who = "%s<br><small><em>Uploader:</em> %s</small>" \
+                               % (who, u_who)
         else:
             who = "&nbsp;"
 

=== modified file 'merge-status.py'
--- merge-status.py	2013-08-02 10:09:52 +0000
+++ merge-status.py	2015-07-08 16:40:28 +0000
@@ -266,23 +266,31 @@
     for uploaded, priority, package, user, uploader, source, \
             base_version, left_version, right_version in merges:
         if user is not None:
-            who = user
-            who = who.replace("&", "&amp;")
-            who = who.replace("<", "&lt;")
-            who = who.replace(">", "&gt;")
+            (usr_name, usr_mail) = parseaddr(user)
+            user_lp_page = get_person_lp_page(usr_mail)
+            user = user.replace("&", "&amp;")
+            user = user.replace("<", "&lt;")
+            user = user.replace(">", "&gt;")
+            if user_lp_page:
+                who = "<a href='%s'>%s</a>" % (user_lp_page.encode("utf-8"), user)
+            else:
+                who = user
 
             if uploader is not None:
-                (usr_name, usr_mail) = parseaddr(user)
                 (upl_name, upl_mail) = parseaddr(uploader)
+                upl_lp_page = get_person_lp_page(upl_mail)
 
                 if len(usr_name) and usr_name != upl_name:
                     u_who = uploader
                     u_who = u_who.replace("&", "&amp;")
                     u_who = u_who.replace("<", "&lt;")
                     u_who = u_who.replace(">", "&gt;")
-
-                    who = "%s<br><small><em>Uploader:</em> %s</small>" \
-                            % (who, u_who)
+                    if upl_lp_page:
+                        who = "%s<br><small><em>Uploader:</em> <a href='%s'>%s</a></small>" \
+                                % (who, upl_lp_page.encode("utf-8"), u_who)
+                    else:
+                        who = "%s<br><small><em>Uploader:</em> %s</small>" \
+                               % (who, u_who)
         else:
             who = "&nbsp;"
 

=== modified file 'momlib.py'
--- momlib.py	2015-05-05 08:59:52 +0000
+++ momlib.py	2015-07-08 16:40:28 +0000
@@ -33,9 +33,13 @@
 import logging
 import datetime
 import stat
+import json
 
 from cgi import escape
 from optparse import OptionParser
+from urllib import quote
+from urllib2 import urlopen
+from contextlib import closing
 
 from deb.controlfile import ControlFile
 from deb.version import Version
@@ -106,6 +110,9 @@
 # Cache of parsed sources files
 SOURCES_CACHE = {}
 
+# mapping of uploader emails to Launchpad pages
+person_lp_page_mapping = {}
+
 
 # --------------------------------------------------------------------------- #
 # Command-line tool functions
@@ -169,6 +176,26 @@
     """Return an md5sum."""
     return md5(open(filename).read()).hexdigest()
 
+def get_person_lp_page(person_email):
+    """Make a best guess at what the person's LP page is."""
+    if person_email in person_lp_page_mapping:
+        return person_lp_page_mapping[person_email]
+    email = quote(person_email)
+    find_person = "https://api.launchpad.net/devel/people/?ws.op=findPerson&text=%s" % email
+    try:
+        with closing(urlopen(find_person)) as response:
+            content = response.read()
+    except IOError:
+        return None
+    data = json.loads(content)["entries"]
+    # findPerson does a startswith match so could return multiple entries, if
+    # that happens return None as credentials are needed to confirm the email.
+    if len(data) != 1:
+        person_lp_page_mapping[person_email] = None
+    else:
+        person_lp_page_mapping[person_email] = data[0]["web_link"]
+    return person_lp_page_mapping[person_email]
+
 
 # --------------------------------------------------------------------------- #
 # Location functions