Martinvlba/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new is_download field

Browse Source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2010-09-30 14:32:54 -05:00
parent 3ebe31bdad
commit bb84f9c96c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mirrors/utils.py
View File

@ -10,7 +10,7 @@
@cache_function(300) @cache_function(300)
def get_mirror_statuses(cutoff=default_cutoff): def get_mirror_statuses(cutoff=default_cutoff):
cutoff_time = datetime.datetime.utcnow() - cutoff cutoff_time = datetime.datetime.utcnow() - cutoff
protocols = MirrorProtocol.objects.exclude(protocol__iexact='rsync') protocols = list(MirrorProtocol.objects.filter(is_download=True))
# I swear, this actually has decent performance... # I swear, this actually has decent performance...
urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter( urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter(
mirror__active=True, mirror__public=True, mirror__active=True, mirror__public=True,

6
mirrors/views.py
View File

@ -25,7 +25,7 @@ def __init__(self, *args, **kwargs):
self.fields['country'].choices = make_choice(mirrors) self.fields['country'].choices = make_choice(mirrors)
self.fields['country'].initial = ['Any'] self.fields['country'].initial = ['Any']
protos = make_choice( protos = make_choice(
MirrorProtocol.objects.exclude(protocol__iexact='rsync')) MirrorProtocol.objects.filter(is_download=True))
self.fields['protocol'].choices = protos self.fields['protocol'].choices = protos
self.fields['protocol'].initial = [t[0] for t in protos] self.fields['protocol'].initial = [t[0] for t in protos]
@ -45,8 +45,8 @@ def generate_mirrorlist(request):
def find_mirrors(request, countries=None, protocols=None, use_status=False): def find_mirrors(request, countries=None, protocols=None, use_status=False):
if not protocols: if not protocols:
protocols = MirrorProtocol.objects.exclude( protocols = MirrorProtocol.objects.filter(
protocol__iexact='rsync').values_list('protocol', flat=True) is_download=True).values_list('protocol', flat=True)
qset = MirrorUrl.objects.select_related().filter( qset = MirrorUrl.objects.select_related().filter(
protocol__protocol__in=protocols, protocol__protocol__in=protocols,
mirror__public=True, mirror__active=True, mirror__isos=True mirror__public=True, mirror__active=True, mirror__isos=True