From c05107dbdd6c47e08144753637de6db7d1fb7384 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 26 Oct 2011 14:05:23 +0100 Subject: [PATCH] Speed up blacklist checking by removing duplicate entries --- app/hr/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/hr/utils.py b/app/hr/utils.py index 726c7d5..f3eedfd 100644 --- a/app/hr/utils.py +++ b/app/hr/utils.py @@ -53,13 +53,13 @@ def blacklist_values(user, level=BLACKLIST_LEVEL_NOTE): blacklist.extend(objs) # Check Corporation blacklists - corporations = [re.escape(x) for x in evechars.values_list('corporation__name', flat=True) if x] + corporations = set([re.escape(x) for x in evechars.values_list('corporation__name', flat=True) if x]) if len(corporations): objs = bl_items.filter(type=BLACKLIST_TYPE_CORPORATION, value__iregex=r'^(' + '|'.join(corporations) + ')$') blacklist.extend(objs) # Check Alliance blacklists - alliances = [re.escape(x) for x in evechars.values_list('corporation__alliance__name', flat=True) if x] + alliances = set([re.escape(x) for x in evechars.values_list('corporation__alliance__name', flat=True) if x]) if len(alliances): objs = bl_items.filter(type=BLACKLIST_TYPE_ALLIANCE, value__iregex=r'^(' + '|'.join([x for x in alliances if x]) + ')$') blacklist.extend(objs)