Merge tag 'release_2012-01-11'

Pkgbase view in todos, other changes related to caching

Conflicts:
	public/views.py

4 files changed, 32 insertions, 18 deletions

diff --git a/devel/management/commands/reporead.py b/devel/management/commands/reporead.py
index 4dd26091..bf1b2562 100644
--- a/devel/management/commands/reporead.py
+++ b/devel/management/commands/reporead.py
@@ -24,7 +24,6 @@ from datetime import datetime
 from optparse import make_option
 
 from django.core.management.base import BaseCommand, CommandError
-from django.contrib.auth.models import User
 from django.db import connections, router, transaction
 from django.db.utils import IntegrityError
 
@@ -91,6 +90,7 @@ class Pkg(object):
             setattr(self, k, None)
         for k in self.collections:
             setattr(self, k, ())
+        self.builddate = None
         self.files = None
         self.has_files = False
 
@@ -244,6 +244,12 @@ pkg_same_version = lambda pkg, dbpkg: pkg.ver == dbpkg.pkgver \
         and pkg.rel == dbpkg.pkgrel and pkg.epoch == dbpkg.epoch
 
 
+def delete_pkg_files(dbpkg):
+    database = router.db_for_write(Package, instance=dbpkg)
+    cursor = connections[database].cursor()
+    cursor.execute('DELETE FROM package_files WHERE pkg_id = %s', [dbpkg.id])
+
+
 def populate_files(dbpkg, repopkg, force=False):
     if not force:
         if not pkg_same_version(repopkg, dbpkg):
@@ -258,7 +264,7 @@ def populate_files(dbpkg, repopkg, force=False):
 
     # only delete files if we are reading a DB that contains them
     if repopkg.has_files:
-        dbpkg.packagefile_set.all().delete()
+        delete_pkg_files(dbpkg)
         logger.info("adding %d files for package %s",
                 len(repopkg.files), dbpkg.pkgname)
         for f in repopkg.files:
@@ -267,6 +273,7 @@ def populate_files(dbpkg, repopkg, force=False):
                 filename = None
             # this is basically like calling dbpkg.packagefile_set.create(),
             # but much faster as we can skip a lot of the repeated code paths
+            # TODO use Django 1.4 bulk_create
             pkgfile = PackageFile(pkg=dbpkg,
                     is_directory=(filename is None),
                     directory=dirname + '/',
@@ -366,6 +373,7 @@ def db_update(archname, reponame, pkgs, force=False):
         with transaction.commit_on_success():
             # no race condition here as long as simultaneous threads both
             # issue deletes; second delete will be a no-op
+            delete_pkg_files(dbpkg)
             dbpkg.delete()
 
     # packages in both database and in syncdb (update in database)
diff --git a/devel/tests.py b/devel/tests.py
index 36691179..01eed0fc 100644
--- a/devel/tests.py
+++ b/devel/tests.py
@@ -99,7 +99,7 @@ class FindUserTest(TestCase):
 
     def test_cache(self):
         # simply look two of them up, but then do it repeatedly
-        for i in range(50):
+        for _ in range(5):
             self.assertEqual(self.user1,
                     self.finder.find("XXX YYY <user1@example.com>"))
             self.assertEqual(self.user3,
diff --git a/devel/urls.py b/devel/urls.py
index bc3bcace..07cb321b 100644
--- a/devel/urls.py
+++ b/devel/urls.py
@@ -7,8 +7,8 @@ urlpatterns = patterns('devel.views',
     (r'^$',          'index', {},     'devel-index'),
     (r'^newuser/$',  'new_user_form'),
     (r'^profile/$',  'change_profile'),
-    (r'^reports/(?P<report>.*)/(?P<username>.*)/$', 'report'),
-    (r'^reports/(?P<report>.*)/$', 'report'),
+    (r'^reports/(?P<report_name>.*)/(?P<username>.*)/$', 'report'),
+    (r'^reports/(?P<report_name>.*)/$', 'report'),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/devel/views.py b/devel/views.py
index f7ed3539..dc2283ca 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -13,6 +13,7 @@ from django.template import loader, Context
 from django.template.defaultfilters import filesizeformat
 from django.views.decorators.cache import never_cache
 from django.views.generic.simple import direct_to_template
+from django.utils.http import http_date
 
 from main.models import Package, PackageDepend, PackageFile, TodolistPkg
 from main.models import Arch, Repo
@@ -27,9 +28,9 @@ import operator
 import pytz
 import random
 from string import ascii_letters, digits
+import time
 
 @login_required
-@never_cache
 def index(request):
     '''the developer dashboard'''
     if(request.user.is_authenticated()):
@@ -80,7 +81,6 @@ def index(request):
     return direct_to_template(request, 'devel/index.html', page_dict)
 
 @login_required
-@never_cache
 def clock(request):
     devs = User.objects.filter(is_active=True).order_by(
             'first_name', 'last_name').select_related('userprofile')
@@ -98,7 +98,14 @@ def clock(request):
             'utc_now': utc_now,
     }
 
-    return direct_to_template(request, 'devel/clock.html', page_dict)
+    response = direct_to_template(request, 'devel/clock.html', page_dict)
+    if not response.has_header('Expires'):
+        # why this works only with the non-UTC date I have no idea...
+        expire_time = now.replace(minute=utc_now.minute + 1,
+                second=0, microsecond=0)
+        expire_time = time.mktime(expire_time.timetuple())
+        response['Expires'] = http_date(expire_time)
+    return response
 
 class ProfileForm(forms.Form):
     email = forms.EmailField(label='Private email (not shown publicly):',
@@ -145,7 +152,7 @@ def change_profile(request):
             {'form': form, 'profile_form': profile_form})
 
 @login_required
-def report(request, report, username=None):
+def report(request, report_name, username=None):
     title = 'Developer Report'
     packages = Package.objects.normal()
     names = attrs = user = None
@@ -159,17 +166,17 @@ def report(request, report, username=None):
     maints = User.objects.filter(id__in=PackageRelation.objects.filter(
         type=PackageRelation.MAINTAINER).values('user'))
 
-    if report == 'old':
+    if report_name == 'old':
         title = 'Packages last built more than two years ago'
         cutoff = datetime.utcnow() - timedelta(days=365 * 2)
         packages = packages.filter(
                 build_date__lt=cutoff).order_by('build_date')
-    elif report == 'long-out-of-date':
+    elif report_name == 'long-out-of-date':
         title = 'Packages marked out-of-date more than 90 days ago'
         cutoff = datetime.utcnow() - timedelta(days=90)
         packages = packages.filter(
                 flag_date__lt=cutoff).order_by('flag_date')
-    elif report == 'big':
+    elif report_name == 'big':
         title = 'Packages with compressed size > 50 MiB'
         cutoff = 50 * 1024 * 1024
         packages = packages.filter(
@@ -182,7 +189,7 @@ def report(request, report, username=None):
                 package.compressed_size)
             package.installed_size_pretty = filesizeformat(
                 package.installed_size)
-    elif report == 'badcompression':
+    elif report_name == 'badcompression':
         title = 'Packages that have little need for compression'
         cutoff = 0.90 * F('installed_size')
         packages = packages.filter(compressed_size__gt=0, installed_size__gt=0,
@@ -199,7 +206,7 @@ def report(request, report, username=None):
             ratio = package.compressed_size / float(package.installed_size)
             package.ratio = '%.2f' % ratio
             package.compress_type = package.filename.split('.')[-1]
-    elif report == 'uncompressed-man':
+    elif report_name == 'uncompressed-man':
         title = 'Packages with uncompressed manpages'
         # checking for all '.0'...'.9' + '.n' extensions
         bad_files = PackageFile.objects.filter(directory__contains='/man/',
@@ -209,7 +216,7 @@ def report(request, report, username=None):
             bad_files = bad_files.filter(pkg__in=pkg_ids)
         bad_files = bad_files.values_list('pkg_id', flat=True).distinct()
         packages = packages.filter(id__in=set(bad_files))
-    elif report == 'uncompressed-info':
+    elif report_name == 'uncompressed-info':
         title = 'Packages with uncompressed infopages'
         # we don't worry about looking for '*.info-1', etc., given that an
         # uncompressed root page probably exists in the package anyway
@@ -220,7 +227,7 @@ def report(request, report, username=None):
             bad_files = bad_files.filter(pkg__in=pkg_ids)
         bad_files = bad_files.values_list('pkg_id', flat=True).distinct()
         packages = packages.filter(id__in=set(bad_files))
-    elif report == 'unneeded-orphans':
+    elif report_name == 'unneeded-orphans':
         title = 'Orphan packages required by no other packages'
         owned = PackageRelation.objects.all().values('pkgbase')
         required = PackageDepend.objects.all().values('depname')
@@ -273,7 +280,7 @@ class NewUserForm(forms.ModelForm):
     def save(self, commit=True):
         profile = super(NewUserForm, self).save(False)
         pwletters = ascii_letters + digits
-        password = ''.join([random.choice(pwletters) for i in xrange(8)])
+        password = ''.join([random.choice(pwletters) for _ in xrange(8)])
         user = User.objects.create_user(username=self.cleaned_data['username'],
                 email=self.cleaned_data['private_email'], password=password)
         user.first_name = self.cleaned_data['first_name']
@@ -342,7 +349,6 @@ def new_user_form(request):
     return direct_to_template(request, 'general_form.html', context)
 
 @user_passes_test(lambda u: u.is_superuser)
-@never_cache
 def admin_log(request, username=None):
     user = None
     if username: