Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	packages/urls.py
	templates/packages/details.html

1 files changed, 80 insertions, 0 deletions

diff --git a/devel/utils.py b/devel/utils.py
index abfdabe5..d7a154a8 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -1,7 +1,11 @@
+import re
+
 from django.contrib.auth.models import User
 from django.db import connection
+from django.db.models import Count, Q
 
 from main.utils import cache_function
+from main.models import Package
 from packages.models import PackageRelation
 
 @cache_function(300)
@@ -28,10 +32,86 @@ SELECT pr.user_id, COUNT(*), COUNT(p.flag_date)
         pkg_count[k] = total
         flag_count[k] = flagged
 
+    update_count = Package.objects.values_list('packager').order_by(
+            'packager').annotate(Count('packager'))
+    update_count = dict(update_count)
+
     for m in maintainers:
         m.package_count = pkg_count.get(m.id, 0)
         m.flagged_count = flag_count.get(m.id, 0)
+        m.updated_count = update_count.get(m.id, 0)
 
     return maintainers
 
+
+class UserFinder(object):
+    def __init__(self):
+        self.cache = {}
+
+    @staticmethod
+    def user_email(name, email):
+        if email:
+            return User.objects.get(email=email)
+        return None
+
+    @staticmethod
+    def profile_email(name, email):
+        if email:
+            return User.objects.get(userprofile__public_email=email)
+        return None
+
+    @staticmethod
+    def user_name(name, email):
+        # yes, a bit odd but this is the easiest way since we can't always be
+        # sure how to split the name. Ensure every 'token' appears in at least
+        # one of the two name fields.
+        if not name:
+            return None
+        name_q = Q()
+        for token in name.split():
+            # ignore quoted parts; e.g. nicknames in strings
+            if re.match(r'^[\'"].*[\'"]$', token):
+                continue
+            name_q &= (Q(first_name__icontains=token) |
+                    Q(last_name__icontains=token))
+        return User.objects.get(name_q)
+
+    def find(self, userstring):
+        '''
+        Attempt to find the corresponding User object for a standard
+        packager string, e.g. something like
+            'A. U. Thor <author@example.com>'.
+        We start by searching for a matching email address; we then move onto
+        matching by first/last name. If we cannot find a user, then return None.
+        '''
+        if not userstring:
+            return None
+        if userstring in self.cache:
+            return self.cache[userstring]
+
+        name = email = None
+
+        matches = re.match(r'^([^<]+)? ?<([^>]*)>?', userstring)
+        if not matches:
+            name = userstring.strip()
+        else:
+            name = matches.group(1)
+            email = matches.group(2)
+
+        user = None
+        find_methods = (self.user_email, self.profile_email, self.user_name)
+        for matcher in find_methods:
+            try:
+                user = matcher(name, email)
+                if user != None:
+                    break
+            except (User.DoesNotExist, User.MultipleObjectsReturned):
+                pass
+
+        self.cache[userstring] = user
+        return user
+
+    def clear_cache(self):
+        self.cache = {}
+
 # vim: set ts=4 sw=4 et: