Merge tag 'release_2013-12-19' into archweb-generic

Mirror URL page, other random stuff

4 files changed, 34 insertions, 2 deletions

diff --git a/mirrors/models.py b/mirrors/models.py
index 47e2051b..57664562 100644
--- a/mirrors/models.py
+++ b/mirrors/models.py
@@ -1,3 +1,4 @@
+from datetime import timedelta
 import socket
 from urlparse import urlparse
 
@@ -159,6 +160,14 @@ class MirrorLog(models.Model):
     is_success = models.BooleanField(default=True)
     error = models.TextField(blank=True, default='')
 
+    def delay(self):
+        if self.last_sync is None:
+            return None
+        # sanity check, this shouldn't happen
+        if self.check_time < self.last_sync:
+            return timedelta()
+        return self.check_time - self.last_sync
+
     def __unicode__(self):
         return "Check of %s at %s" % (self.url.url, self.check_time)
 
diff --git a/mirrors/urls.py b/mirrors/urls.py
index 7cf76aa1..b1054380 100644
--- a/mirrors/urls.py
+++ b/mirrors/urls.py
@@ -9,6 +9,7 @@ urlpatterns = patterns('mirrors.views',
     (r'^locations/json/$',      'locations_json',  {}, 'mirror-locations-json'),
     (r'^(?P<name>[\.\-\w]+)/$', 'mirror_details'),
     (r'^(?P<name>[\.\-\w]+)/json/$', 'mirror_details_json'),
+    (r'^(?P<name>[\.\-\w]+)/(?P<url_id>\d+)/$', 'url_details'),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/mirrors/utils.py b/mirrors/utils.py
index 9f40bca6..0dd26ae0 100644
--- a/mirrors/utils.py
+++ b/mirrors/utils.py
@@ -22,7 +22,8 @@ def dictfetchall(cursor):
     ]
 
 @cache_function(178)
-def status_data(cutoff_time, mirror_id=None):
+def status_data(cutoff=DEFAULT_CUTOFF, mirror_id=None):
+    cutoff_time = now() - cutoff
     if mirror_id is not None:
         params = [cutoff_time, mirror_id]
         mirror_where = 'AND u.mirror_id = %s'
@@ -125,7 +126,7 @@ def get_mirror_statuses(cutoff=DEFAULT_CUTOFF, mirror_id=None, show_all=False):
         valid_urls = valid_urls.filter(active=True, mirror__active=True,
                 mirror__public=True)
 
-    url_data = status_data(cutoff_time, mirror_id)
+    url_data = status_data(cutoff, mirror_id)
     urls = MirrorUrl.objects.select_related('mirror', 'protocol').filter(
             id__in=valid_urls).order_by('mirror__id', 'url')
 
diff --git a/mirrors/views.py b/mirrors/views.py
index 9e05e5fc..34336165 100644
--- a/mirrors/views.py
+++ b/mirrors/views.py
@@ -186,6 +186,7 @@ def mirror_details(request, name):
     }
     return render(request, 'mirrors/mirror_details.html', context)
 
+
 def mirror_details_json(request, name):
     authorized = request.user.is_authenticated()
     mirror = get_object_or_404(Mirror, name=name)
@@ -199,6 +200,26 @@ def mirror_details_json(request, name):
     return response
 
 
+def url_details(request, name, url_id):
+    url = get_object_or_404(MirrorUrl.objects.select_related(),
+            id=url_id, mirror__name=name)
+    mirror = url.mirror
+    authorized = request.user.is_authenticated()
+    if not authorized and \
+            (not mirror.public or not mirror.active or not url.active):
+        raise Http404
+    error_cutoff = timedelta(days=7)
+    cutoff_time = now() - error_cutoff
+    logs = MirrorLog.objects.select_related('location').filter(
+            url=url, check_time__gte=cutoff_time).order_by('-check_time')
+
+    context = {
+        'url': url,
+        'logs': logs,
+    }
+    return render(request, 'mirrors/url_details.html', context)
+
+
 def status(request, tier=None):
     if tier is not None:
         tier = int(tier)