From: W. Trevor King Date: Mon, 19 Oct 2009 23:52:14 +0000 (-0400) Subject: Merged Gianluca's html becommand with templates. X-Git-Tag: 1.0.0~59^2~86^2~4 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f8095a840581a1b0a8297501dcae89a76b6ce5d4;p=be.git Merged Gianluca's html becommand with templates. --- f8095a840581a1b0a8297501dcae89a76b6ce5d4 diff --cc .be/bugs/c271a802-d324-48a6-b01d-63e4a72aa43e/values index b859364,1b71be1..27cfc2f --- a/.be/bugs/c271a802-d324-48a6-b01d-63e4a72aa43e/values +++ b/.be/bugs/c271a802-d324-48a6-b01d-63e4a72aa43e/values @@@ -7,10 -7,10 +7,10 @@@ reporter: gianluca 0: raise cmdutil.UsageError, "Too many arguments." -- ++ bd = bugdir.BugDir(from_disk=True, manipulate_encodings=manipulate_encodings) bd.load_all_bugs() @@@ -79,15 -85,19 +85,19 @@@ ordered_bug_list = sorted([(value,key) for (key,value) in stime.items()]) ordered_bug_list_in = sorted([(value,key) for (key,value) in stime.items()]) #open_bug_list = sorted([(value,key) for (key,value) in bugs.items()]) -- - html_gen = BEHTMLGen(bd) ++ + html_gen = BEHTMLGen(bd, template, options.verbose) html_gen.create_index_file(out_dir, st, bugs_active, ordered_bug_list, "active", bd.encoding) html_gen.create_index_file(out_dir, st, bugs_inactive, ordered_bug_list, "inactive", bd.encoding) -- ++ def get_parser(): - parser = cmdutil.CmdOptionParser("be open OUTPUT_DIR") + parser = cmdutil.CmdOptionParser("be html [options]") parser.add_option("-o", "--output", metavar="export_dir", dest="outdir", - help="Set the output path, default is ./html_export", default="html_export") - help="Set the output path, default is ./html_export", default="html_export") ++ help="Set the output path, default is ./html_export", default="html_export") + parser.add_option("-t", "--template-dir", metavar="template", dest="template", + help="Use a different template, default is empty", default=None) + parser.add_option("-v", "--verbose", action="store_true", metavar="verbose", dest="verbose", + help="Verbose output, default is no", default=False) return parser longhelp=""" @@@ -102,7 -112,7 +112,7 @@@ def complete(options, args, parser) for option, value in cmdutil.option_value_pairs(options, parser): if "--complete" in args: raise cmdutil.GetCompletions() # no positional arguments for list -- ++ def escape(string): if string == None: @@@ -116,289 -126,305 +126,305 @@@ return "".join(chars) class BEHTMLGen(): - def __init__(self, bd): - self.index_value = "" + def __init__(self, bd, template, verbose): - self.index_value = "" ++ self.index_value = "" self.bd = bd - + self.verbose = verbose + if template == None: + self.template = "default" + else: + self.template = template + self.css_file = """ - body { - font-family: "lucida grande", "sans serif"; - color: #333; - width: auto; - margin: auto; - } - - - div.main { - padding: 20px; - margin: auto; - padding-top: 0; - margin-top: 1em; - background-color: #fcfcfc; - } - - .comment { - padding: 20px; - margin: auto; - padding-top: 20px; - margin-top: 0; - } - - .commentF { - padding: 0px; - margin: auto; - padding-top: 0px; - paddin-bottom: 20px; - margin-top: 0; - } - - tb { - border = 1; - } - - .wishlist-row { - background-color: #B4FF9B; - width: auto; - } - - .minor-row { - background-color: #FCFF98; - width: auto; - } - - - .serious-row { - background-color: #FFB648; - width: auto; - } - - .critical-row { - background-color: #FF752A; - width: auto; - } - - .fatal-row { - background-color: #FF3300; - width: auto; - } - - .person { - font-family: courier; - } - - a, a:visited { - background: inherit; - text-decoration: none; - } - - a { - color: #003d41; - } - - a:visited { - color: #553d41; - } - - ul { - list-style-type: none; - padding: 0; - } - - p { - width: auto; - } - - .inline-status-image { - position: relative; - top: 0.2em; - } - - .dimmed { - color: #bbb; - } - - table { - border-style: 10px solid #313131; - border-spacing: 0; - width: auto; - } - - table.log { - } - - td { - border-width: 0; - border-style: none; - padding-right: 0.5em; - padding-left: 0.5em; - width: auto; - } - - .td_sel { - background-color: #afafaf; - border: 1px solid #afafaf; - font-weight:bold; - padding-right: 1em; - padding-left: 1em; - - } - - .td_nsel { - border: 0px; - padding-right: 1em; - padding-left: 1em; - } - - tr { - vertical-align: top; - width: auto; - } - - h1 { - padding: 0.5em; - background-color: #305275; - margin-top: 0; - margin-bottom: 0; - color: #fff; - margin-left: -20px; - margin-right: -20px; - } - - wid { - text-transform: uppercase; - font-size: smaller; - margin-top: 1em; - margin-left: -0.5em; - /*background: #fffbce;*/ - /*background: #628a0d;*/ - padding: 5px; - color: #305275; - } - - .attrname { - text-align: right; - font-size: smaller; - } - - .attrval { - color: #222; - } - - .issue-closed-fixed { - background-image: "green-check.png"; - } - - .issue-closed-wontfix { - background-image: "red-check.png"; - } - - .issue-closed-reorg { - background-image: "blue-check.png"; - } - - .inline-issue-link { - text-decoration: underline; - } - - img { - border: 0; - } - - - div.footer { - font-size: small; - padding-left: 20px; - padding-right: 20px; - padding-top: 5px; - padding-bottom: 5px; - margin: auto; - background: #305275; - color: #fffee7; - } - - .footer a { - color: #508d91; - } - - - .header { - font-family: "lucida grande", "sans serif"; - font-size: smaller; - background-color: #a9a9a9; - text-align: left; - - padding-right: 0.5em; - padding-left: 0.5em; - - } - - - .selected-cell { - background-color: #e9e9e2; - } - - .plain-cell { - background-color: #f9f9f9; - } - - - .logcomment { - padding-left: 4em; - font-size: smaller; - } - - .id { - font-family: courier; - } - - .table_bug { - background-color: #afafaf; - border: 2px solid #afafaf; - } - - .message { - } - - .progress-meter-done { - background-color: #03af00; - } - - .progress-meter-undone { - background-color: #ddd; - } - - .progress-meter { - } - + body { + font-family: "lucida grande", "sans serif"; + color: #333; + width: auto; + margin: auto; + } - - ++ ++ + div.main { + padding: 20px; + margin: auto; + padding-top: 0; + margin-top: 1em; + background-color: #fcfcfc; + } - ++ + .comment { + padding: 20px; + margin: auto; + padding-top: 20px; + margin-top: 0; + } - ++ + .commentF { + padding: 0px; + margin: auto; + padding-top: 0px; + paddin-bottom: 20px; + margin-top: 0; + } - ++ + tb { + border = 1; + } - ++ + .wishlist-row { + background-color: #B4FF9B; + width: auto; + } - ++ + .minor-row { + background-color: #FCFF98; + width: auto; + } - - ++ ++ + .serious-row { + background-color: #FFB648; + width: auto; + } - ++ + .critical-row { + background-color: #FF752A; + width: auto; + } - ++ + .fatal-row { + background-color: #FF3300; + width: auto; + } - ++ + .person { + font-family: courier; + } - ++ + a, a:visited { + background: inherit; + text-decoration: none; + } - ++ + a { + color: #003d41; + } - ++ + a:visited { + color: #553d41; + } - ++ + ul { + list-style-type: none; + padding: 0; + } - ++ + p { + width: auto; + } - ++ + .inline-status-image { + position: relative; + top: 0.2em; + } - ++ + .dimmed { + color: #bbb; + } - ++ + table { + border-style: 10px solid #313131; + border-spacing: 0; + width: auto; + } - ++ + table.log { + } - ++ + td { + border-width: 0; + border-style: none; + padding-right: 0.5em; + padding-left: 0.5em; + width: auto; + } - ++ + .td_sel { + background-color: #afafaf; + border: 1px solid #afafaf; + font-weight:bold; + padding-right: 1em; + padding-left: 1em; - ++ + } - ++ + .td_nsel { + border: 0px; + padding-right: 1em; + padding-left: 1em; + } - ++ + tr { + vertical-align: top; + width: auto; + } - ++ + h1 { + padding: 0.5em; + background-color: #305275; + margin-top: 0; + margin-bottom: 0; + color: #fff; + margin-left: -20px; - margin-right: -20px; ++ margin-right: -20px; + } - ++ + wid { + text-transform: uppercase; + font-size: smaller; + margin-top: 1em; - margin-left: -0.5em; ++ margin-left: -0.5em; + /*background: #fffbce;*/ + /*background: #628a0d;*/ + padding: 5px; + color: #305275; + } - ++ + .attrname { + text-align: right; + font-size: smaller; + } - ++ + .attrval { + color: #222; + } - ++ + .issue-closed-fixed { + background-image: "green-check.png"; + } - ++ + .issue-closed-wontfix { + background-image: "red-check.png"; + } - ++ + .issue-closed-reorg { + background-image: "blue-check.png"; + } - ++ + .inline-issue-link { + text-decoration: underline; + } - ++ + img { + border: 0; + } - - ++ ++ + div.footer { + font-size: small; + padding-left: 20px; + padding-right: 20px; + padding-top: 5px; + padding-bottom: 5px; + margin: auto; + background: #305275; + color: #fffee7; + } - ++ + .footer a { + color: #508d91; + } - - ++ ++ + .header { + font-family: "lucida grande", "sans serif"; + font-size: smaller; + background-color: #a9a9a9; + text-align: left; - ++ + padding-right: 0.5em; + padding-left: 0.5em; - ++ + } - - ++ ++ + .selected-cell { + background-color: #e9e9e2; + } - ++ + .plain-cell { + background-color: #f9f9f9; + } - - ++ ++ + .logcomment { + padding-left: 4em; + font-size: smaller; + } - ++ + .id { + font-family: courier; + } - ++ + .table_bug { + background-color: #afafaf; + border: 2px solid #afafaf; + } - ++ + .message { + } - ++ + .progress-meter-done { + background-color: #03af00; + } - ++ + .progress-meter-undone { + background-color: #ddd; + } - ++ + .progress-meter { - } ++ } """ - - self.index_first = """ - - - - BugsEverywhere Issue Tracker - - - - - - -
-

BugsEverywhere Bug List

-

- - - - - - - -
Active BugsInactive Bugs
- - - """ % self.bd.encoding -- ++ + self.index_file = """ + + + + BugsEverywhere Issue Tracker + + + + - - ++ ++ +
+

BugsEverywhere Bug List

+

+
- ++ + + + + - ++ +
Active BugsInactive Bugs
+ + - ++ + %s - ++ + +
- ++ +
- ++ +
Generated by BugsEverywhere on %s
- ++ + + + """ - ++ self.bug_line =""" %s @@@ -408,8 -434,8 +434,8 @@@ %s """ -- - self.detail_first = """ ++ + self.detail_file = """ @@@ -419,40 -445,36 +445,36 @@@ -- -- ++ ++

BugsEverywhere Bug List

-
Back to Index
+
Back to Index

Bug: _bug_id_

- """ % self.bd.encoding - - - - self.detail_line =""" - - - - """ -- - self.index_last = """ ++ + %s - ++ + %s
%s%s
-
- -
Generated by BugsEverywhere on %s
- +
Back to Index
+
Generated by BugsEverywhere.
- ++ """ -- - self.comment_section = """ ++ + self.detail_line =""" + + %s%s + """ - - self.begin_comment_section =""" + - ++ + self.comment_section =""" Comments: @@@ -464,19 -483,36 +483,36 @@@ """ - - self.detail_last = """ - - - -
Back to Index
-
Generated by BugsEverywhere.
- - - """ - - + + if template != None: + try: + FI = open("%s/style.css"%self.template) + self.css_file = FI.read() + FI.close() + except: + pass + try: + FI = open("%s/index_file.tpl"%self.template) + self.index_first = FI.read() + FI.close() + except: + pass + + try: + FI.open("%s/detail_file.tpl"%self.template) + self.detail_first = FI.read() + FI.close() + except: + pass + try: + FI.open("%s/comment_section.tpl"%self.template) + self.comment_section = FI.read() + FI.close() + except: + pass - ++ def create_index_file(self, out_dir_path, summary, bugs, ordered_bug, fileid, encoding): - ++ try: os.stat(out_dir_path) except: @@@ -490,37 -526,54 +526,54 @@@ FO.close() except: raise cmdutil.UsageError, "Cannot create the style.css file." -- ++ try: os.mkdir(out_dir_path+"/bugs") except: pass -- ++ try: if fileid == "active": + if self.verbose: + print "Creating active bug index..." FO = codecs.open(out_dir_path+"/index.html", "w", encoding) - FO.write(self.index_first%('td_sel','td_nsel')) if fileid == "inactive": + if self.verbose: + print "Creating inactive bug index..." FO = codecs.open(out_dir_path+"/index_inactive.html", "w", encoding) - FO.write(self.index_first%('td_nsel','td_sel')) except: raise cmdutil.UsageError, "Cannot create the index.html file." -- ++ c = 0 t = len(bugs) - 1 + line = "" for l in range(t, -1, -1): - line = self.bug_line%(escape(bugs[l].severity), + if self.verbose: + print "Creating bug entry: %s"%escape(bugs[l].uuid[0:3]) + line += self.bug_line%(escape(bugs[l].severity), escape(bugs[l].uuid), escape(bugs[l].uuid[0:3]), escape(bugs[l].uuid), escape(bugs[l].status), escape(bugs[l].uuid), escape(bugs[l].severity), escape(bugs[l].uuid), escape(bugs[l].summary), escape(bugs[l].uuid), escape(bugs[l].time_string) ) - FO.write(line) c += 1 + if self.verbose: + print "\tCreating detail entry for bug: %s"%escape(bugs[l].uuid[0:3]) self.create_detail_file(bugs[l], out_dir_path, fileid, encoding) when = time.ctime() - FO.write(self.index_last%when) - ++ + try: + if fileid == "active": + if self.verbose: + print "Writing active bug index..." + FO.write(self.index_file%(encoding, 'td_sel','td_nsel', line, when)) + if fileid == "inactive": + if self.verbose: + print "Writing inactive bug index..." + FO.write(self.index_file%(encoding,'td_nsel','td_sel', line, when)) + except: + raise cmdutil.UsageError, "Cannot create the index.html file." def create_detail_file(self, bug, out_dir_path, fileid, encoding): @@@ -571,18 -619,20 +619,18 @@@ ""] lines.extend(escape(comment.body).splitlines()) if depth == 0: - FD.write('
') + com += '
' else: - FD.write('
') - FD.write("
\n".join(lines)+"
\n") + com += '
' + #FD.write("
\n".join(lines)+"
\n") + com += "
\n".join(lines)+"
\n" while len(stack) > 0: stack.pop(-1) - FD.write("
\n") # close every remaining
\n" # close every remaining