From 4b8d2dc2b041e4fb0a6eed4244c47e3d62a5b3f9 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Thu, 13 May 2010 13:04:37 +0200 Subject: Django implementations of the rest of the patch view/download views --- patchtracker/urls.py | 9 +++++++ patchtracker/views.py | 58 +++++++++++++++++++++++++++++++++++++++++++++ templates/package_vers.html | 27 +++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/patchtracker/urls.py b/patchtracker/urls.py index 9738dc5..95376ca 100644 --- a/patchtracker/urls.py +++ b/patchtracker/urls.py @@ -12,4 +12,13 @@ urlpatterns = patterns('', views.download_debianonly_patch), url(r'^patch/debianonly/view/(?P\w+)/(?P[^/]+)$', views.view_debianonly_patch), + url(r'^patch/nondebian/view/(?P\w+)/(?P[^/]+)$', + views.view_nondebian_patch), + url(r'^patch/nondebian/dl/(?P\w+)/(?P[^/]+)$', + views.download_nondebian_patch), + url(r'^patch/misc/view/(?P\w+)/(?P[^/]+)/(?P.*)$', + views.view_misc_patch), + url(r'^patch/misc/dl/(?P\w+)/(?P[^/]+)/(?P.*)$', + views.download_misc_patch), + ) diff --git a/patchtracker/views.py b/patchtracker/views.py index 611684b..9f5ff56 100644 --- a/patchtracker/views.py +++ b/patchtracker/views.py @@ -78,3 +78,61 @@ def view_debianonly_patch(request, package, version): extra = { 'pkg':pkg, 'patch':'debian-dir only changes', 'patchContents':patchContents, 'patchType':'series', 'conf':Conf } return django.shortcuts.render_to_response(tmpl, extra, context_instance=ctx) + +def view_nondebian_patch(request, package, version): + 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) + patchContents = diffhandler.nondebiandir() + extra = { 'pkg':pkg, 'patch':'direct (non-packaging) changes', + 'patchContents':patchContents, 'patchType':'series', 'conf':Conf } + return django.shortcuts.render_to_response(tmpl, extra, context_instance=ctx) + +def download_nondebian_patch(request, package, version): + 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) + patchContents = diffhandler.nondebiandir() + return django.http.HttpResponse(patchContents, mimetype="text/plain") + +def download_misc_patch(request, package, version, patch): + 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) + patchContents = diffhandler.filterdiff(include=patch) + return django.http.HttpResponse(patchContents, mimetype="text/plain") + +def view_misc_patch(request, package, version, patch): + 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) + patchContents = diffhandler.filterdiff(include=patch) + extra = { 'pkg':pkg, 'patch':patch, 'patchContents':patchContents, + 'patchType':'series', 'conf':Conf } + return django.shortcuts.render_to_response(tmpl, extra, context_instance=ctx) + + diff --git a/templates/package_vers.html b/templates/package_vers.html index 536aed0..81f03b2 100644 --- a/templates/package_vers.html +++ b/templates/package_vers.html @@ -117,5 +117,32 @@ debian specific patch information for {{ pkg.name }} / {{ pkg.version }} {% endif %} {% endif %} +{% if pkg.diffgz_name and diffhandler.nondebiandir.lines %} +
+ +

Misc. Non-packaging "direct" style patches

+ + + + + + + + + + {% for insd,deld,modd,f in diffhandler.nondebiandir.diffstat.stats %} + + + + + + {% endfor %} +
fileinserteddeletedmodifiedviewdownload
{{ f }}{{ insd }}{{ deld }}{{ modd }} + view + + download +
+
+{% endif %} {% endblock %} -- cgit v1.2.3