Remove dead patch handling code

4 files changed, 3 insertions, 264 deletions

diff --git a/patchtracker/ReqHandler.py b/patchtracker/ReqHandler.py
index da23525..ca81be7 100755
--- a/patchtracker/ReqHandler.py
+++ b/patchtracker/ReqHandler.py
@@ -5,9 +5,7 @@ import os
 import sys
 
 import patchtracker.Conf as Conf
-from patchtracker.Templates import ErrorTemplate, PatchTemplate, LetterTocTemplate, FrontPageTemplate, SearchResultsTemplate
-from patchtracker.DiffGzHandler import DiffGzHandler, DiffGzException
-from patchtracker.DebTarHandler import DebTarHandler
+from patchtracker.Templates import ErrorTemplate, LetterTocTemplate, FrontPageTemplate, SearchResultsTemplate
 from patchtracker.CacheObject import CacheObject, CacheMissException
 import patchtracker.DB as DB
 from patchtracker.DB import PatchTrackerDB
@@ -35,58 +33,6 @@ class ErrorCmd(Cmd):
   def output(self):
     return str(ErrorTemplate(self.msg))
 
-class PatchCmd(Cmd):
-  def __init__(self, args):
-    Cmd.__init__(self)
-    self.db = PatchTrackerDB()
-    self.patchtype,mode,pkgname,version = args[0:4]
-    self.parsemode(mode)
-    dh = self.make_diffhandler(pkgname,version)
-    if self.patchtype == "series":
-      self.patchname = os.sep.join(args[4:])
-      self.content = dh.series().fetch(self.patchname)
-    elif self.patchtype == "debianonly":
-      self.patchname = "debian-dir only changes"
-      self.content = dh.debiandir()
-    elif self.patchtype == "nondebian":
-      self.patchname = "direct (non packaging) changes"
-      self.content = dh.nondebiandir()
-    elif self.patchtype == "misc":
-      self.patchname = os.sep.join(args[4:])
-      self.content = dh.filterdiff(include=self.patchname)
-    else:
-      raise ReqHandlerException("unhandled patch type '%s'"%(self.patchtype))
-    self.pkgname = pkgname
-    self.version = version
-
-  def parsemode(self, mode):
-    if mode == "view" or mode == "dl":
-      self.mode = mode
-    else:
-      raise ReqHandlerException("unhandled display mode '%s'"%(mode))
-    if mode == "dl":
-      self.content_type = "text/x-diff"
-
-  # XXX this is kinda ugly...
-  def make_diffhandler(self, pkgname, vers):
-    dfile = self.db.findDiffGz(pkgname,vers)
-    if dfile:
-      return DiffGzHandler(dfile)
-    else:
-      dfile = self.db.findDebTar(pkgname, vers)
-      if dfile:
-        return DebTarHandler(dfile)
-      else:
-        raise ReqHandlerException("can not find diff file for %s / %s"%(pkgname,vers))
-
-  def output(self):
-    if self.mode == "dl":
-      return str(self.content)
-    else:
-      return str(PatchTemplate(pkg=self.pkgname,vers=self.version,
-                               patch=self.content,name=self.patchname,
-                               patchtype=self.patchtype))
-
 class PackageCmd(Cmd):
   def __init__(self, args):
     Cmd.__init__(self)
@@ -173,10 +119,7 @@ class CmdHandler:
     args = uri[len(Conf.root_url)+1:].split("/")
     cmdarg = args[0]
     cacheable = False
-    if cmdarg == "patch":
-      self.cmd = PatchCmd(args[1:])
-      cacheable = True
-    elif cmdarg == "package":
+    if cmdarg == "package":
       self.cmd = PackageCmd(args[1:]) 
       if len(args[1:]) > 1:
         cacheable = True
@@ -208,8 +151,6 @@ class CmdHandler:
     except CacheMissException:
       result = self.cmd.output()
       self.cacheobj.put(result)
-    except DiffGzException, e:
-      return ErrorCmd(str(e), "500 Oh Noez!!1!").output()
 
     return result
 
diff --git a/patchtracker/Templates.py b/patchtracker/Templates.py
index 7d599c5..42e07dc 100755
--- a/patchtracker/Templates.py
+++ b/patchtracker/Templates.py
@@ -1,6 +1,4 @@
-from patchtracker import Conf, DB
-from patchtracker.DiffGzHandler import DiffGzHandler
-from patchtracker.DebTarHandler import DebTarHandler
+from patchtracker import Conf
 from patchtracker.SourceArchive import ReleaseList
 
 from Cheetah.Template import Template
@@ -64,21 +62,3 @@ class ErrorTemplate(OurTemplate):
     tpl = os.sep.join([Conf.template_dir, "cgi_error.tmpl"])
     OurTemplate.__init__(self, file=tpl, searchList={'error':msg})
 
-class PatchTemplate(OurTemplate):
-  def __init__(self, pkg=None, vers=None, name=None, patch=None,patchtype=None):
-    tpl = os.sep.join([Conf.template_dir, "patch_view.tmpl"])
-    sl = {'package':pkg, 'version':vers, 'name':name, 
-          'patch':patch, 'patchtype':patchtype}
-    sl['crumbs'] = [("package/"+pkg,pkg),
-                    ("package/"+pkg+"/"+vers, pkg+"/"+vers)]
-    if patchtype == "debianonly":
-      sl['crumbs'].append( ("patch/%s/view/%s/%s"%(patchtype,pkg,vers),
-                            "./debian-dir only patch") )
-    elif patchtype == "series":
-      sl['crumbs'].append(("patch/%s/view/%s/%s/%s"%(patchtype,pkg,vers,name),
-                           "series patch "+name) )
-    elif patchtype == "misc":
-      sl['crumbs'].append(("patch/%s/view/%s/%s/%s"%(patchtype,pkg,vers,name),
-                           "direct patch of "+name) )
-    OurTemplate.__init__(self, file=tpl, searchList=sl)
-
diff --git a/templates/package_vers.tmpl b/templates/package_vers.tmpl
deleted file mode 100755
index 23ab83e..0000000
--- a/templates/package_vers.tmpl
+++ /dev/null
@@ -1,149 +0,0 @@
-#import templates
-#extends templates.skeleton
-#def title
-debian specific patch information for $src.name / $src.version
-#end def
-#def body
-  #set $u = $conf.root_url
-  <h1>debian specific patch information for $src.name / $src.version</h1>
-  <div class="diffsummary">
-   <a name="diff-summary"></a>
-   <h2> Summary </h2>
-   <table class="summary">
-    <tr>
-     <th>Package Version</th>
-     <th>Package Type</th>
-     <th>Source Package Format</th>
-    </tr>
-    <tr>
-     <td>$src.version</td>
-     <td>$src.type</td>
-     <td>$src.format</td>
-    </tr>
-   </table>
-  </div> <!-- diffsummary -->
-
-#if $src.debtar_name
-  <div class="debdiff">
-   <a name="debian-tarball"></a>
-   <h2> Debian packaging Information </h2>
-   <table class="patchlisting">
-    <tr>
-     <th>Debian changes tarfile</th>
-     <td colspan="2">
-      <a href="$conf.archive_root_url/$src.loc/$src.debtar_name">
-       $src.debtar_name
-      </a>
-     </td>
-    </tr>
-    <tr>
-     <th>Size</th><td colspan="2">$src.debtar_size</td>
-    </tr>
-    <tr>
-     <th>MD5sum</th><td colspan="2">$src.debtar_md5sum</td>
-    </tr>
-   </table>
-  </div> <!-- debdiff -->
-#end if
-
-#if $src.diffgz_name
-  <div class="debdiff">
-   <a name="debian-patches"></a>
-   <h2> Debian packaging Information </h2>
-   <table class="patchlisting">
-    <tr>
-     <th>Diff file</th>
-     <td colspan="2">
-      <a href="$conf.archive_root_url/$src.loc/$src.diffgz_name">
-       $src.diffgz_name
-      </a>
-     </td>
-    </tr>
-    <tr>
-     <th>Size</th><td colspan="2">$src.diffgz_size</td>
-    </tr>
-    <tr>
-     <th>MD5sum</th><td colspan="2">$src.diffgz_md5sum</td>
-    </tr>
-    <tr>
-     <th>./debian only changes</th>
-     <td>
-      <a href="$u/patch/debianonly/view/$src.name/$src.version">view</a>
-     </td>
-     <td>
-      <a href="$u/patch/debianonly/dl/$src.name/$src.version">download</a>
-     </td>
-    </tr>
- #if $src.diffgz_name and $diffhandler.nondebiandir.lines
-    <tr>
-     <th>non packaging (i.e. not ./debian) changes</th>
-     <td>
-      <a href="$u/patch/nondebian/view/$src.name/$src.version">view</a>
-     </td>
-     <td>
-      <a href="$u/patch/nondebian/dl/$src.name/$src.version">download</a>
-     </td>
-    </tr>
- #end if
-   </table>
-  </div> <!-- debdiff -->
- #end if
-
-#if $src.diffgz_name and $diffhandler.nondebiandir.lines
-  <div class="nondebdiff">
-   <a name="direct-patches"></a>
-   <h2> Misc. Non-packaging "direct" style patches </h2>
-   <table class="patchlisting">
-    <tr>
-     <th>file</th>
-     <th>inserted</th>
-     <th>deleted</th>
-     <th>modified</th>
-     <th>view</th>
-     <th>download</th>
-    </tr>
- #for $insd,$deld,$modd,$f in $diffhandler.nondebiandir.diffstat.stats
-    <tr>
-     <td>$f</td><td>$insd</td><td>$deld</td><td>$modd</td>
-     <td>
-      <a href="$u/patch/misc/view/$src.name/$src.version/$f">view</a>
-     </td>
-     <td>
-      <a href="$u/patch/misc/dl/$src.name/$src.version/$f">download</a>
-     </td>
-    </tr>
- #end for
-   </table>
-  </div> <!-- nondebdiff -->
-#end if
-
-#if $src.diffgz_name or $src.debtar_name
-#set $series = $diffhandler.series
-#if $series
-  <div class="debseries">
-   <a name="series-patches"></a>
-   <h2> "series" style patches </h2>
-   <table class="patchlisting">
-    <tr>
-     <th>patch</th>
-     <th>summary</th>
-     <th>view</th>
-     <th>raw</th>
-    </tr>
- #for $name,$patch in $series.iterpatches()
-    <tr>
-     <td>$name</td>
-     <td class="diffstat"><pre>$patch.diffstat</pre></td>
-     <td>
-      <a href="$u/patch/series/view/$src.name/$src.version/$name">view</a>
-     </td>
-     <td>
-      <a href="$u/patch/series/dl/$src.name/$src.version/$name">download</a>
-     </td>
-    </tr>
- #end for
-   </table>
-  </div> <!-- debseries -->
-#end if
-#end if
-#end def
diff --git a/templates/patch_view.tmpl b/templates/patch_view.tmpl
deleted file mode 100644
index 0a715b9..0000000
--- a/templates/patch_view.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-#import templates
-#extends templates.skeleton
-#import pygments
-#from pygments.lexers import DiffLexer
-#from pygments.formatters import HtmlFormatter
-#from cgi import escape
-#def title
-Patch information for $package ($version) $name
-#end def
-#def body
- <h1>$package ($version) $name</h1>
- <h2>Summary</h2>
- <div>
-  <code class="diffstat">
-    <pre>
-$escape($str($patch.diffstat))
-    </pre>
-  </code>
- </div>
- <div>
-  <a href="$conf.root_url/patch/$patchtype/dl/$package/$version/$name">
-   download this patch
-  </a>
- </div>
- <h2>Patch contents</h2>
- <div class="patch">
-  #try
-   $pygments.highlight($str($patch).decode('utf-8'), $DiffLexer(), $HtmlFormatter(style='colorful', noclasses=True, encoding='utf-8'))
-  #except UnicodeDecodeError
-   $pygments.highlight($str($patch).decode('latin-1'), $DiffLexer(), $HtmlFormatter(style='colorful', noclasses=True, encoding='latin-1'))
-  #end try
- </div>
-#end def