summaryrefslogtreecommitdiff
path: root/mirrors/views.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-01-14 01:00:11 -0600
committerDan McGee <dan@archlinux.org>2013-01-14 01:05:54 -0600
commit6f0ae6746baea657ee6d7c21ac0813a04f825443 (patch)
treebccc596760284ed7d04e08408ec7cf73edd50485 /mirrors/views.py
parent5b8b6991b0b9f8174f153fe4b46376451b222cc1 (diff)
Drop country column from mirror table
We now always look for this information at the URL level, not the mirror level. This simplifies quite a bit of code in and around the mirror views. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'mirrors/views.py')
-rw-r--r--mirrors/views.py15
1 files changed, 5 insertions, 10 deletions
diff --git a/mirrors/views.py b/mirrors/views.py
index d3867802..545e3557 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -42,9 +42,6 @@ class MirrorlistForm(forms.Form):
def get_countries(self):
country_codes = set()
- country_codes.update(Mirror.objects.filter(active=True).exclude(
- country='').values_list(
- 'country', flat=True).order_by().distinct())
country_codes.update(MirrorUrl.objects.filter(
mirror__active=True).exclude(country='').values_list(
'country', flat=True).order_by().distinct())
@@ -81,7 +78,7 @@ def generate_mirrorlist(request):
def default_protocol_filter(original_urls):
- key_func = attrgetter('real_country')
+ key_func = attrgetter('country')
sorted_urls = sorted(original_urls, key=key_func)
urls = []
for _, group in groupby(sorted_urls, key=key_func):
@@ -119,8 +116,7 @@ def find_mirrors(request, countries=None, protocols=None, use_status=False,
protocol__in=protocols,
mirror__public=True, mirror__active=True)
if countries and 'all' not in countries:
- qset = qset.filter(Q(country__in=countries) |
- Q(mirror__country__in=countries))
+ qset = qset.filter(country__in=countries)
ip_version = Q()
if ipv4_supported:
@@ -135,7 +131,7 @@ def find_mirrors(request, countries=None, protocols=None, use_status=False,
urls = qset
if not use_status:
- sort_key = attrgetter('real_country.name', 'mirror.name', 'url')
+ sort_key = attrgetter('country.name', 'mirror.name', 'url')
urls = sorted(urls, key=sort_key)
template = 'mirrors/mirrorlist.txt'
else:
@@ -158,7 +154,7 @@ def find_mirrors_simple(request, protocol):
def mirrors(request):
- mirror_list = Mirror.objects.select_related().order_by('tier', 'country')
+ mirror_list = Mirror.objects.select_related().order_by('tier', 'name')
protos = MirrorUrl.objects.values_list(
'mirror_id', 'protocol__protocol').order_by(
'mirror__id', 'protocol__protocol').distinct()
@@ -254,8 +250,7 @@ class MirrorStatusJSONEncoder(DjangoJSONEncoder):
return list(obj)
if isinstance(obj, MirrorUrl):
data = {attr: getattr(obj, attr) for attr in self.url_attributes}
- # get any override on the country attribute first
- country = obj.real_country
+ country = obj.country
data['country'] = unicode(country.name)
data['country_code'] = country.code
return data