Merge tag 'release_2012-04-07'

I hate writing tag messages.

Conflicts:
	packages/templatetags/package_extras.py
	templates/packages/flag.html
	templates/packages/flaghelp.html
	templates/public/download.html
	templates/public/index.html
	templates/public/svn.html

1 files changed, 8 insertions, 46 deletions

diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index aa2721af..fc132105 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -4,7 +4,6 @@ from urllib import urlencode
 from django.contrib import messages
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth.models import User
-from django.core.serializers.json import DjangoJSONEncoder
 from django.http import HttpResponse, Http404
 from django.shortcuts import get_object_or_404, redirect
 from django.utils import simplejson
@@ -12,50 +11,19 @@ from django.views.decorators.http import require_POST
 from django.views.decorators.vary import vary_on_headers
 from django.views.generic.simple import direct_to_template
 
-from main.models import Package, PackageFile, PackageDepend, Arch, Repo
+from main.models import Package, PackageFile, Arch, Repo
 from mirrors.models import MirrorUrl
-from ..models import (PackageRelation, PackageGroup, License,
-        Conflict, Provision, Replacement)
+from mirrors.utils import get_mirror_url_for_download
+from ..models import PackageRelation
 from ..utils import (get_group_info, get_differences_info,
-        multilib_differences, get_wrong_permissions)
+        multilib_differences, get_wrong_permissions, PackageJSONEncoder)
 
 # make other views available from this same package
 from .flag import flaghelp, flag, flag_confirmed, unflag, unflag_all
-from .search import search
+from .search import search, search_json
 from .signoff import signoffs, signoff_package, signoff_options, signoffs_json
 
 
-class PackageJSONEncoder(DjangoJSONEncoder):
-    pkg_attributes = [ 'pkgname', 'pkgbase', 'repo', 'arch', 'pkgver',
-            'pkgrel', 'epoch', 'pkgdesc', 'url', 'filename', 'compressed_size',
-            'installed_size', 'build_date', 'last_update', 'flag_date',
-            'maintainers', 'packager' ]
-    pkg_list_attributes = [ 'groups', 'licenses', 'conflicts',
-            'provides', 'replaces', 'depends' ]
-
-    def default(self, obj):
-        if hasattr(obj, '__iter__'):
-            # mainly for queryset serialization
-            return list(obj)
-        if isinstance(obj, Package):
-            data = dict((attr, getattr(obj, attr))
-                    for attr in self.pkg_attributes)
-            for attr in self.pkg_list_attributes:
-                data[attr] = getattr(obj, attr).all()
-            return data
-        if isinstance(obj, PackageFile):
-            filename = obj.filename or ''
-            return obj.directory + filename
-        if isinstance(obj, (Repo, Arch)):
-            return obj.name.lower()
-        if isinstance(obj, (PackageGroup, License)):
-            return obj.name
-        if isinstance(obj, (Conflict, Provision, Replacement, PackageDepend)):
-            return unicode(obj)
-        elif isinstance(obj, User):
-            return obj.username
-        return super(PackageJSONEncoder, self).default(obj)
-
 def opensearch(request):
     if request.is_secure():
         domain = "https://%s" % request.META['HTTP_HOST']
@@ -225,21 +193,15 @@ def files_json(request, name, repo, arch):
 def download(request, name, repo, arch):
     pkg = get_object_or_404(Package,
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
-    mirror_urls = MirrorUrl.objects.filter(
-            mirror__public=True, mirror__active=True,
-            protocol__protocol__iexact='HTTP')
-    # look first for an 'Any' URL, then fall back to any HTTP URL
-    filtered_urls = mirror_urls.filter(mirror__country='Any')[:1]
-    if not filtered_urls:
-        filtered_urls = mirror_urls[:1]
-    if not filtered_urls:
+    url = get_mirror_url_for_download()
+    if not url:
         raise Http404
     arch = pkg.arch.name
     if pkg.arch.agnostic:
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
     values = {
-        'host': filtered_urls[0].url,
+        'host': url.url,
         'arch': arch,
         'repo': pkg.repo.name.lower(),
         'file': pkg.filename,