=== modified file 'bugHelper/commandLine.py' --- bugHelper/commandLine.py 2007-01-26 10:52:39 +0000 +++ bugHelper/commandLine.py 2007-01-30 03:08:16 +0000 @@ -14,8 +14,8 @@ parser.set_defaults(attachments=False, sourcepackage=None, url=None, minbug=None, verbose=0) parser.set_usage(usage="""%prog --version - %prog [-A] [-m ] [-f ] -p - %prog [-A] [-m ] [-f ] -l """) + %prog [-A] [-m ] [-f ] [--format=] -p + %prog [-A] [-m ] [-f ] [--format=] -l """) parser.add_option("-p", "--package", type="string", dest="sourcepackage", metavar="package name", @@ -31,6 +31,8 @@ help="doesn't print the bug numbers listed") parser.add_option("-v", "--verbose", type="int", dest="verbose", help="display inherited clues") + parser.add_option("--format", type="string", dest="format", default="plain", + help="format output type (plain|wiki|html)") if parser.get_prog_name() == "bugnumbers": @@ -66,3 +68,19 @@ self.parser = parser (self.options, self.args) = parser.parse_args() +def printBug(format, bugNum, displayclues, attachments): + if format=="plain": + print """http://launchpad.net/bugs/%s - %s +%s""" % (bugNum, displayclues.keys()[0], attachments) + + elif format=="html": + print """Bug %s - %s
+%s""" % (bugNum, bugNum, displayclues.keys()[0], attachments) + + elif format=="wiki": + print """{{{[http://launchpad.net/bugs/%s bug #%s] - %s}}} +%s""" % (bugNum, bugNum, displayclues.keys()[0], attachments) + + else: + print """http://launchpad.net/bugs/%s - %s +%s""" % (bugNum, displayclues.keys()[0], attachments) \ No newline at end of file === modified file 'bughelper' --- bughelper 2007-01-25 14:56:51 +0000 +++ bughelper 2007-01-30 03:08:29 +0000 @@ -8,12 +8,12 @@ from sets import Set try: - from commandLine import commandLine + from commandLine import commandLine, printBug from infoFiles import infoFiles from HTMLOperations import bugList, bug import utils except: - from bugHelper.commandLine import commandLine + from bugHelper.commandLine import commandLine, printBug from bugHelper.infoFiles import infoFiles from bugHelper.HTMLOperations import bugList, bug import bugHelper.utils as utils @@ -61,10 +61,9 @@ for a in displayclues[displayclues.keys()[0]]], "\n") else: attachments = "" - print """http://launchpad.net/bugs/%s - %s -%s""" % (bugNum, displayclues.keys()[0], attachments) + printBug(cl.options.format, bugNum, displayclues, attachments) else: - print "http://launchpad.net/bugs/%s" % bugNum + printBug(cl.options.format, bugNum, displayclues, attachments) for dc in displayclues.keys(): if displayclues[dc]: attachments = string.join([" - attachment: %s" % a \ @@ -74,7 +73,6 @@ print """ - %s %s""" % (dc, attachments) - if __name__ == "__main__": main()