commonize all the diffhandler stuff into the SourcePackage model

2 files changed, 22 insertions, 32 deletions

diff --git a/patchtracker/models.py b/patchtracker/models.py
index 95a59df..3d4f582 100644
--- a/patchtracker/models.py
+++ b/patchtracker/models.py
@@ -1,5 +1,9 @@
+import os
 import re
 
+import Conf
+import DiffGzHandler, DebTarHandler
+
 from django.db import models
 from django.contrib import admin
 
@@ -24,6 +28,15 @@ class SourcePackage (models.Model):
     else:
       return "Native"
 
+  def diffhandler( self ):
+    """ Return a diffhandler object too the caller """
+    if self.diffgz_name:
+      dgz = os.sep.join([Conf.archive_root, self.loc, self.diffgz_name])
+      return DiffGzHandler.DiffGzHandler(dgz)
+    elif self.debtar_name:
+      dtar = os.sep.join([Conf.archive_root, self.loc, self.debtar_name])
+      return DebTarHandler.DebTarHandler(dtar)
+
   def anchor_name(self):
     """ output a version of the package name suitable for use as an
         anchor name (i.e. <a name="foo">) """
diff --git a/patchtracker/views.py b/patchtracker/views.py
index 4db3666..e790f3a 100644
--- a/patchtracker/views.py
+++ b/patchtracker/views.py
@@ -5,8 +5,6 @@ import django.shortcuts
 import django.template
 
 import ComplexQueries
-import DebTarHandler
-import DiffGzHandler
 import Conf
 import models
 
@@ -14,14 +12,7 @@ def package_vers(request, package, version):
   pkg = models.SourcePackage.objects.get( name=package, version=version )
   ctx = django.template.RequestContext(request)
   tmpl = 'package_vers.html'
-  diffhandler = None
-  if pkg.diffgz_name:
-    dgz = os.sep.join([Conf.archive_root, pkg.loc, pkg.diffgz_name])
-    diffhandler = DiffGzHandler.DiffGzHandler(dgz)
-  elif pkg.debtar_name:
-    dtar = os.sep.join([Conf.archive_root, pkg.loc, pkg.debtar_name])
-    diffhandler = DebTarHandler.DebTarHandler(dtar)
-  extra = { 'pkg':pkg, 'ctx':ctx, 'conf':Conf, 'diffhandler':diffhandler }
+  extra = { 'pkg':pkg, 'ctx':ctx, 'conf':Conf }
   return django.shortcuts.render_to_response(tmpl, extra, context_instance=ctx)
 
 def display_toc(request, index):
@@ -35,25 +26,18 @@ def display_patch(request, patchType, package, version, patchName):
   pkg = models.SourcePackage.objects.get( name=package, version=version )
   ctx = django.template.RequestContext(request)
   tmpl = 'patch_view.html'
-  diffhandler = None
-  if pkg.diffgz_name:
-    dgz = os.sep.join([Conf.archive_root, pkg.loc, pkg.diffgz_name])
-    diffhandler = DiffGzHandler.DiffGzHandler(dgz)
-  elif pkg.debtar_name:
-    dtar = os.sep.join([Conf.archive_root, pkg.loc, pkg.debtar_name])
-    diffhandler = DebTarHandler.DebTarHandler(dtar)
 
   if patchType == "debianonly":
-    patch = diffhandler.debiandir()
+    patch = pkg.diffhandler().debiandir()
     patchTitle = "debian-dir only changes"
   elif patchType == "misc":
-    patch = diffhandler.filterdiff(include=patchName)
+    patch = pkg.diffhandler().filterdiff(include=patchName)
     patchTitle = patchName
   elif patchType == "nondebian":
-    patch = diffhandler.nondebiandir()
+    patch = pkg.diffhandler().nondebiandir()
     patchTitle = "direct (non-packaging) changes"
   elif patchType == "series":
-    patch = diffhandler.series().fetch(patchName)
+    patch = pkg.diffhandler().series().fetch(patchName)
     patchTitle = patchName
 
   extra = { 'pkg':pkg, 'patch':patch, 'patchType':patchType, 'conf':Conf,
@@ -62,19 +46,12 @@ def display_patch(request, patchType, package, version, patchName):
 
 def download_patch(request, patchType, package, version, patchName):
   pkg = models.SourcePackage.objects.get( name=package, version=version )
-  diffhandler = None
-  if pkg.diffgz_name:
-    dgz = os.sep.join([Conf.archive_root, pkg.loc, pkg.diffgz_name])
-    diffhandler = DiffGzHandler.DiffGzHandler(dgz)
-  elif pkg.debtar_name:
-    dtar = os.sep.join([Conf.archive_root, pkg.loc, pkg.debtar_name])
-    diffhandler = DebTarHandler.DebTarHandler(dtar)
   if patchType == "debianonly":
-    patch = diffhandler.debiandir()
+    patch = pkg.diffhandler().debiandir()
   elif patchType == "misc":
-    patch = diffhandler.filterdiff(include=patchName)
+    patch = pkg.diffhandler().filterdiff(include=patchName)
   elif patchType == "nondebian":
-    patch = diffhandler.nondebiandir()
+    patch = pkg.diffhandler().nondebiandir()
   elif patchType == "series":
-    patch = diffhandler.series().fetch(patchName)
+    patch = pkg.diffhandler().series().fetch(patchName)
   return django.http.HttpResponse(patch, mimetype="text/plain")