summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/management/commands/rematch_developers.py4
-rw-r--r--devel/utils.py50
2 files changed, 38 insertions, 16 deletions
diff --git a/devel/management/commands/rematch_developers.py b/devel/management/commands/rematch_developers.py
index ab2f0f4b..2b379588 100644
--- a/devel/management/commands/rematch_developers.py
+++ b/devel/management/commands/rematch_developers.py
@@ -53,6 +53,7 @@ def match_packager(finder):
unmatched = Package.objects.filter(packager__isnull=True).values_list(
'packager_str', flat=True).order_by().distinct()
+ logger.info("%d packager strings retrieved", len(unmatched))
for packager in unmatched:
logger.debug("packager string %s", packager)
user = finder.find(packager)
@@ -71,13 +72,14 @@ def match_packager(finder):
@transaction.commit_on_success
def match_flagrequest(finder):
- logger.info("getting all flag requests emails from unknown users")
+ logger.info("getting all flag request email addresses from unknown users")
req_count = matched_count = 0
mapping = {}
unmatched = FlagRequest.objects.filter(user__isnull=True).values_list(
'user_email', flat=True).order_by().distinct()
+ logger.info("%d email addresses retrieved", len(unmatched))
for user_email in unmatched:
logger.debug("email %s", user_email)
user = finder.find_by_email(user_email)
diff --git a/devel/utils.py b/devel/utils.py
index 85b4e42f..e8e3a6c4 100644
--- a/devel/utils.py
+++ b/devel/utils.py
@@ -1,6 +1,7 @@
import re
from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
from django.db import connection
from django.db.models import Count, Q
@@ -44,6 +45,15 @@ SELECT pr.user_id, COUNT(*), COUNT(p.flag_date)
return maintainers
+def ignore_does_not_exist(func):
+ def new_func(*args, **kwargs):
+ try:
+ return func(*args, **kwargs)
+ except (ObjectDoesNotExist, MultipleObjectsReturned):
+ return None
+ return new_func
+
+
class UserFinder(object):
def __init__(self):
self.cache = {}
@@ -52,18 +62,33 @@ class UserFinder(object):
self.pgp_cache = {}
@staticmethod
+ @ignore_does_not_exist
def user_email(name, email):
if email:
return User.objects.get(email=email)
return None
@staticmethod
+ @ignore_does_not_exist
+ def username_email(name, email):
+ if email and '@' in email:
+ # split email addr at '@' symbol, ensure domain matches
+ # or is a subdomain of archlinux.org
+ # TODO: configurable domain/regex somewhere?
+ username, domain = email.split('@', 1)
+ if re.match(r'^(.+\.)?archlinux.org$', domain):
+ return User.objects.get(username=username)
+ return None
+
+ @staticmethod
+ @ignore_does_not_exist
def profile_email(name, email):
if email:
return User.objects.get(userprofile__public_email=email)
return None
@staticmethod
+ @ignore_does_not_exist
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
@@ -102,14 +127,12 @@ class UserFinder(object):
email = matches.group(2)
user = None
- find_methods = (self.user_email, self.profile_email, self.user_name)
+ find_methods = (self.user_email, self.profile_email,
+ self.username_email, self.user_name)
for matcher in find_methods:
- try:
- user = matcher(name, email)
- if user != None:
- break
- except (User.DoesNotExist, User.MultipleObjectsReturned):
- pass
+ user = matcher(name, email)
+ if user != None:
+ break
self.cache[userstring] = user
self.email_cache[email] = user
@@ -135,14 +158,11 @@ class UserFinder(object):
if email in self.email_cache:
return self.email_cache[email]
- user = None
- try:
- user = self.user_email(None, email)
- except User.DoesNotExist:
- try:
- user = self.profile_email(None, email)
- except User.DoesNotExist:
- pass
+ user = self.user_email(None, email)
+ if user is None:
+ user = self.profile_email(None, email)
+ if user is None:
+ user = self.username_email(None, email)
self.email_cache[email] = user
return user