X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=626b9327c39fab2cfb9dd45eeed599bb8f4e5db9;hb=281403d6d387e3adad068ece921af17f507d0f0c;hp=9cf3d282e1bda3064d97b44347fad759cbe7b3d8;hpb=e4c57fa70ce986b1fce91a9c9aa5838abfebe72b;p=dak.git
diff --git a/dak/examine_package.py b/dak/examine_package.py
index 9cf3d282..626b9327 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -34,7 +34,7 @@
import errno, os, pg, re, sys, md5
import apt_pkg, apt_inst
-import daklib.database, daklib.utils
+import daklib.database, daklib.utils, daklib.queue
################################################################################
@@ -54,24 +54,8 @@ re_version = re.compile('^(.*)\((.*)\)')
re_newlinespace = re.compile('\n')
re_spacestrip = re.compile('(\s)')
-################################################################################
-
-# Colour definitions
-
-# Main
-main_colour = "\033[36m"
-# Contrib
-contrib_colour = "\033[33m"
-# Non-Free
-nonfree_colour = "\033[31m"
-# Arch
-arch_colour = "\033[32m"
-# End
-end_colour = "\033[0m"
-# Bold
-bold_colour = "\033[1m"
-# Bad maintainer
-maintainer_colour = arch_colour
+html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
+re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
################################################################################
@@ -84,6 +68,9 @@ daklib.database.init(Cnf, projectB)
printed_copyrights = {}
+# default is to not output html.
+use_html = 0
+
################################################################################
def usage (exit_code=0):
@@ -91,11 +78,104 @@ def usage (exit_code=0):
Check NEW package(s).
-h, --help show this help and exit
+ -H, --html-output output html page with inspection result
+ -f, --file-name filename for the html page
PACKAGE can be a .changes, .dsc, .deb or .udeb filename."""
sys.exit(exit_code)
+################################################################################
+# probably xml.sax.saxutils would work as well
+
+def html_escape(s):
+ return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+
+def escape_if_needed(s):
+ if use_html:
+ return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+ else:
+ return s
+
+def headline(s, level=2, bodyelement=None):
+ if use_html:
+ if bodyelement:
+ print """
+ | %(title)s |
|---|
+ """%{"bodyelement":bodyelement,"title":html_escape(s)}
+ else:
+ print "%s" % (level, html_escape(s), level)
+ else:
+ print "---- %s ----" % (s)
+
+# Colour definitions, 'end' isn't really for use
+
+ansi_colours = {
+ 'main': "\033[36m",
+ 'contrib': "\033[33m",
+ 'nonfree': "\033[31m",
+ 'arch': "\033[32m",
+ 'end': "\033[0m",
+ 'bold': "\033[1m",
+ 'maintainer': "\033[32m"}
+
+html_colours = {
+ 'main': ('',""),
+ 'contrib': ('',""),
+ 'nonfree': ('',""),
+ 'arch': ('',""),
+ 'bold': ('',""),
+ 'maintainer': ('',"")}
+
+def colour_output(s, colour):
+ if use_html:
+ return ("%s%s%s" % (html_colours[colour][0], html_escape(s), html_colours[colour][1]))
+ else:
+ return ("%s%s%s" % (ansi_colours[colour], s, ansi_colours['end']))
+
+def escaped_text(s, strip=False):
+ if use_html:
+ if strip:
+ s = s.strip()
+ return "%s
" % (s)
+ else:
+ return s
+
+def formatted_text(s, strip=False):
+ if use_html:
+ if strip:
+ s = s.strip()
+ return "%s
" % (html_escape(s))
+ else:
+ return s
+
+def output_row(s):
+ if use_html:
+ return """| """+s+""" |
"""
+ else:
+ return s
+
+def format_field(k,v):
+ if use_html:
+ return """| %s: | %s |
"""%(k,v)
+ else:
+ return "%s: %s"%(k,v)
+
+def foldable_output(title, elementnameprefix, content, norow=False):
+ d = {'elementnameprefix':elementnameprefix}
+ if use_html:
+ print """
+
"""%d
+ headline(title, bodyelement="%(elementnameprefix)s-body"%d)
+ if use_html:
+ print """ """%d
+ if norow:
+ print content
+ else:
+ print output_row(content)
+ if use_html:
+ print """