From 9d68e03bca4229a43ad64c13283c730fb091de53 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Mon, 2 Jun 2008 20:17:52 +0200 Subject: rework templates to use inheritance also added a gitignore file to ignore the python noise created by cheetah --- .gitignore | 3 ++ gen-patch-info.py | 6 ++- templates/__init__.py | 0 templates/frontpage.tmpl | 19 ++++----- templates/letter-toc.tmpl | 32 --------------- templates/letter_toc.tmpl | 29 ++++++++++++++ templates/package-vers.tmpl | 96 --------------------------------------------- templates/package_vers.tmpl | 92 +++++++++++++++++++++++++++++++++++++++++++ templates/skeleton.tmpl | 11 ++++++ 9 files changed, 147 insertions(+), 141 deletions(-) create mode 100644 .gitignore create mode 100644 templates/__init__.py delete mode 100644 templates/letter-toc.tmpl create mode 100644 templates/letter_toc.tmpl delete mode 100755 templates/package-vers.tmpl create mode 100755 templates/package_vers.tmpl create mode 100644 templates/skeleton.tmpl diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3f83bf1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +templates/skeleton.py +templates/*.pyc +templates/*.py.bak diff --git a/gen-patch-info.py b/gen-patch-info.py index 2a22c9f..59c56eb 100755 --- a/gen-patch-info.py +++ b/gen-patch-info.py @@ -8,6 +8,7 @@ from fnmatch import fnmatch from gzip import GzipFile from debian_bundle import deb822 from Cheetah.Template import Template +from Cheetah.Compiler import Compiler class Conf: archive_root = '/scratch/debian-archive/debian' @@ -148,7 +149,7 @@ class PackageVersTemplate(OurTemplate): def __init__(self, srcpkg, suite): self.src = srcpkg self.suite = suite - tpl=os.sep.join([Conf.template_dir, "package-vers.tmpl"]) + tpl=os.sep.join([Conf.template_dir, "package_vers.tmpl"]) OurTemplate.__init__(self, file=tpl) class PackageVersWriter(PageWriter): @@ -211,7 +212,7 @@ class LetterTocTemplate(OurTemplate): for name,packagelist in collection.iteritems(): for d in packagelist.iterkeys(): self.dists[d] = True - tpl = os.sep.join([Conf.template_dir, "letter-toc.tmpl"]) + tpl = os.sep.join([Conf.template_dir, "letter_toc.tmpl"]) OurTemplate.__init__(self, file=tpl) class LetterTocWriter(PageWriter): @@ -221,6 +222,7 @@ class LetterTocWriter(PageWriter): PageWriter.__init__(self, dest, template) if __name__ == '__main__': + os.system("cheetah compile templates/skeleton") a = Archive(Conf.archive_root) # just for now until development stablizes diff --git a/templates/__init__.py b/templates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/templates/frontpage.tmpl b/templates/frontpage.tmpl index 6bf9b34..e283f98 100644 --- a/templates/frontpage.tmpl +++ b/templates/frontpage.tmpl @@ -1,17 +1,14 @@ - - - - Debian Project patch tracking system - - - +#import templates +#extends templates.skeleton +#def title +Debian Project patch tracking system +#end def +#def body

Debian Project patch tracking system

Browse patches by package name

#for $k in $allindex.pkgs.iterkeys() #if $allindex.pkgs[$k] $k #end if #end for - - +#end def diff --git a/templates/letter-toc.tmpl b/templates/letter-toc.tmpl deleted file mode 100644 index e25cd4d..0000000 --- a/templates/letter-toc.tmpl +++ /dev/null @@ -1,32 +0,0 @@ - - - - Debian Project patch tracking system - - - -

Debian Project patch tracking system

Packaging patches by index - $idx

- - - -#for $d in $dists.iterkeys() - -#end for - -#for $p in $pkgs - - - #for $d in $dists.iterkeys() - - #end for - -#end for -

package	$d
- $p -	- $pkgs[$p][$d].version -

- - diff --git a/templates/letter_toc.tmpl b/templates/letter_toc.tmpl new file mode 100644 index 0000000..0f2ba02 --- /dev/null +++ b/templates/letter_toc.tmpl @@ -0,0 +1,29 @@ +#import templates +#extends templates.skeleton +#def title +Debian Project patch tracking system +#end def +#def body +

Debian Project patch tracking system

Packaging patches by index - $idx

+ + + +#for $d in $dists.iterkeys() + +#end for + +#for $p in $pkgs + + + #for $d in $dists.iterkeys() + + #end for + +#end for +

package	$d
+ $p +	+ $pkgs[$p][$d].version +

+#end def diff --git a/templates/package-vers.tmpl b/templates/package-vers.tmpl deleted file mode 100755 index 17689c7..0000000 --- a/templates/package-vers.tmpl +++ /dev/null @@ -1,96 +0,0 @@ - - - - debian specific patch information for $src.name / $suite - - - - -

debian specific patch information for $src.name / $suite

Summary

- - - - - - - - - - - - - -#if $src.diffgz - - - - -#end if -

Package Version	$src.version
Package Type	$src.type
Source Package Format	$src.format
Diff.gz	$src.loc / $src.diffgz['name']

- -#if $src.diffgz -

"Debian diff" Information

- - - - - - - - - - - - - - - - - - - - - -

Diff file	- - $src.diffgz['name'] - -
Size	$src.diffgz['size']
MD5sum	$src.diffgz['md5sum']
./debian only changes	view	download
non packaging (i.e. not ./debian) changes	view	download

-#end if - -#if $src.directpatches -

Non-packaging "direct" style patches

- - - - - - - - -

file	inserted	deleted	modified	download

-#end if - -#if $src.seriespatches -

"series" style patches

- - - - - - - -#for $p,$d in $src.seriespatches.iteritems() - - - - - - -#end for -

patch	summary	view	raw
$p	`$d`	view	download

-#end if - - diff --git a/templates/package_vers.tmpl b/templates/package_vers.tmpl new file mode 100755 index 0000000..348c389 --- /dev/null +++ b/templates/package_vers.tmpl @@ -0,0 +1,92 @@ +#import templates +#extends templates.skeleton +#def title +debian specific patch information for $src.name / $suite +#end def +#def body +

debian specific patch information for $src.name / $suite

Summary

+ + + + + + + + + + + + + +#if $src.diffgz + + + + +#end if +

Package Version	$src.version
Package Type	$src.type
Source Package Format	$src.format
Diff.gz	$src.loc / $src.diffgz['name']

+ +#if $src.diffgz +

"Debian diff" Information

+ + + + + + + + + + + + + + + + + + + + + +

Diff file	+ + $src.diffgz['name'] + +
Size	$src.diffgz['size']
MD5sum	$src.diffgz['md5sum']
./debian only changes	view	download
non packaging (i.e. not ./debian) changes	view	download

+#end if + +#if $src.directpatches +

Non-packaging "direct" style patches

+ + + + + + + + +

file	inserted	deleted	modified	download

+#end if + +#if $src.seriespatches +

"series" style patches

+ + + + + + + +#for $p,$d in $src.seriespatches.iteritems() + + + + + + +#end for +

patch	summary	view	raw
$p	`$d`	view	download

+#end if +#end def diff --git a/templates/skeleton.tmpl b/templates/skeleton.tmpl new file mode 100644 index 0000000..cd4ff12 --- /dev/null +++ b/templates/skeleton.tmpl @@ -0,0 +1,11 @@ + + + + $title + + + + $body + + -- cgit v1.2.3