moved more stuff from views to helpers or managers

euscanwww/djeuscan/helpers.py

@@ -2,9 +2,41 @@
 djeuscan.helpers
 """
 
+from distutils.version import StrictVersion, LooseVersion
+
+from djeuscan.models import Package
+
 
 def xint(i):
+    """
+    Tries to cast to int, fallbacks to 0
+    """
     try:
         return int(i)
     except Exception:
         return 0
+
+
+def version_key(version):
+    version = version.version
+    try:
+        return StrictVersion(version)
+    # in case of abnormal version number, fall back to LooseVersion
+    except ValueError:
+        return LooseVersion(version)
+
+
+def packages_from_names(data):
+    """
+    Returns a list of Package objects from a string of names
+    """
+    packages = []
+    data = data.replace("\r", "")
+
+    for pkg in data.split('\n'):
+        if '/' in pkg:
+            cat, pkg = pkg.split('/')
+            packages.extend(Package.objects.filter(category=cat, name=pkg))
+        else:
+            packages.extend(Package.objects.filter(name=pkg))
+    return packages

euscanwww/djeuscan/managers.py

@@ -75,3 +75,48 @@ class PackageManager(models.Manager):
             'id', 'name', 'category', 'n_versions', 'n_packaged', 'n_overlay'
         )
         return packages.filter(version__overlay=overlay).distinct()
+
+    def for_maintainer(self, maintainer):
+        """
+        Returns packages that belong to the given maintainer
+        """
+        res = self.filter(maintainers__id=maintainer.id)
+
+        # performance boost
+        res = res.select_related(
+            'last_version_gentoo',
+            'last_version_overlay',
+            'last_version_upstream'
+        )
+
+        return res
+
+    def for_herd(self, herd):
+        """
+        Returns packages that belong to the given herd
+        """
+        res = self.filter(herds__id=herd.id)
+
+        # performance boost
+        res = res.select_related(
+            'last_version_gentoo',
+            'last_version_overlay',
+            'last_version_upstream'
+        )
+
+        return res
+
+    def for_category(self, category):
+        """
+        Returns packages that belong to the given category
+        """
+        res = self.filter(category=category)
+
+        # performance boost
+        res = res.select_related(
+            'last_version_gentoo',
+            'last_version_overlay',
+            'last_version_upstream'
+        )
+
+        return res

euscanwww/djeuscan/models.py

@@ -62,6 +62,10 @@ class Package(models.Model):
 
     objects = PackageManager()
 
+    @property
+    def homepages(self):
+        return self.homepage.split(' ')
+
     def __unicode__(self):
         return '%s/%s' % (self.category, self.name)
 
@@ -129,6 +133,9 @@ class EuscanResult(models.Model):
     datetime = models.DateTimeField()
     result = models.TextField(blank=True)
 
+    class Meta:
+        get_latest_by = "datetime"
+
 
 class Log(models.Model):
     """

euscanwww/djeuscan/views.py

@@ -3,8 +3,8 @@
 from annoying.decorators import render_to
 from django.http import Http404
 from django.shortcuts import get_object_or_404
-from django.db.models import Max
 
+from djeuscan.helpers import version_key, packages_from_names
 from djeuscan.models import Version, Package, Herd, Maintainer, EuscanResult, \
     VersionLog
 from djeuscan.forms import WorldForm, PackagesForm
@@ -24,10 +24,7 @@ def index(request):
         'n_maintainers': Maintainer.objects.count(),
     }
     try:
-        context['last_scan'] = \
+        context['last_scan'] = EuscanResult.objects.latest().datetime
-            EuscanResult.objects.get(
-                id=EuscanResult.objects.aggregate(Max('id'))['id__max']
-            ).datetime
     except EuscanResult.DoesNotExist:
         context['last_scan'] = None
 
@@ -46,10 +43,7 @@ def categories(request):
 
 @render_to('euscan/category.html')
 def category(request, category):
-    packages = Package.objects.filter(category=category)
+    packages = Package.objects.for_category(category)
-    packages = packages.select_related(
-        'last_version_gentoo', 'last_version_overlay', 'last_version_upstream'
-    )
 
     if not packages:
         raise Http404
@@ -65,10 +59,7 @@ def herds(request):
 @render_to('euscan/herd.html')
 def herd(request, herd):
     herd = get_object_or_404(Herd, herd=herd)
-    packages = Package.objects.filter(herds__id=herd.id)
+    packages = Package.for_herd(herd)
-    packages = packages.select_related(
-        'last_version_gentoo', 'last_version_overlay', 'last_version_upstream'
-    )
     return {'herd': herd, 'packages': packages}
 
 
@@ -80,11 +71,8 @@ def maintainers(request):
 
 @render_to('euscan/maintainer.html')
 def maintainer(request, maintainer_id):
-    maintainer = get_object_or_404(Maintainer, id=maintainer_id)
+    maintainer = get_object_or_404(Maintainer, pk=maintainer_id)
-    packages = Package.objects.filter(maintainers__id=maintainer.id)
+    packages = Package.objects.for_maintainer(maintainer)
-    packages = packages.select_related(
-        'last_version_gentoo', 'last_version_overlay', 'last_version_upstream'
-    )
     return {'maintainer': maintainer, 'packages': packages}
 
 
@@ -104,19 +92,7 @@ def overlay(request, overlay):
 
 @render_to('euscan/package.html')
 def package(request, category, package):
-
-    def version_key(version):
-        from distutils.version import StrictVersion, LooseVersion
-
-        version = version.version
-        try:
-            return StrictVersion(version)
-        # in case of abnormal version number, fall back to LooseVersion
-        except ValueError:
-            return LooseVersion(version)
-
     package = get_object_or_404(Package, category=category, name=package)
-    package.homepages = package.homepage.split(' ')
     packaged = Version.objects.filter(package=package, packaged=True)
     upstream = Version.objects.filter(package=package, packaged=False)
 
@@ -143,7 +119,6 @@ def world(request):
 
 @render_to('euscan/world_scan.html')
 def world_scan(request):
-    packages = []
 
     if 'world' in request.FILES:
         data = request.FILES['world'].read()
@@ -152,17 +127,7 @@ def world_scan(request):
     else:
         data = ""
 
-    data = data.replace("\r", "")
+    packages = packages_from_names(data)
-
-    for pkg in data.split('\n'):
-        try:
-            if '/' in pkg:
-                cat, pkg = pkg.split('/')
-                packages.extend(Package.objects.filter(category=cat, name=pkg))
-            else:
-                packages.extend(Package.objects.filter(name=pkg))
-        except:
-            pass
 
     return {'packages': packages}