X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug-status;h=b7c2f80ec75133cdddd983ad227f0d3608e2e832;hb=783225846849b1f9c8f7ba3b54456278a2e46bc6;hp=6a156af28250e5309a968d1791be38da29c2e00a;hpb=aa32d2579b0aa4c8c8a31a1d6060445b254b2be2;p=notmuch
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 6a156af2..b7c2f80e 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -1,10 +1,30 @@
#!/usr/bin/python
#
# Copyright (c) 2011-2012 David Bremner
-Generated: {date}\n')
for thread in threads:
+ stream.write(' \n')
for message_display_data in thread:
stream.write((
- '
\n')
def _message_display_data(self, *args, **kwargs):
@@ -226,38 +249,20 @@ class HtmlPage (Page):
if 'subject' in display_data and 'message-id' in display_data:
d = {
'message-id': quote(display_data['message-id']),
- 'subject': display_data['subject'],
+ 'subject': xml.sax.saxutils.escape(display_data['subject']),
}
display_data['subject'] = (
'{subject}'
).format(**d)
+ for key in ['message-id', 'from']:
+ if key in display_data:
+ display_data[key] = xml.sax.saxutils.escape(display_data[key])
return (running_data, display_data)
def _slug(self, string):
return self._slug_regexp.sub('-', string)
-
-_PAGES['text'] = Page()
-_PAGES['html'] = HtmlPage(
- header='''
-
-
-
-\n'
- ' \n'
- '{date} \n'
- ' \n'
- '{message-id-term}
\n'
- ' \n'
+ ' \n'
+ ' \n'
).format(**message_display_data))
+ stream.write(' \n')
if thread != threads[-1]:
- stream.write('{from} \n'
- ' {subject} \n'
- ' \n')
+ stream.write(
+ ' \n')
stream.write('Notmuch Patches
-
-For more infomation see nmbug
-Views
-'''.format(date=datetime.datetime.utcnow().date()),
- footer='\n\n',
- )
-
-
-parser = argparse.ArgumentParser()
+parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--text', help='output plain text format',
action='store_true')
parser.add_argument('--config', help='load config from given file',
@@ -270,6 +275,75 @@ parser.add_argument('--get-query', help='get query for view',
args = parser.parse_args()
config = read_config(path=args.config)
+context = {
+ 'date': datetime.datetime.utcnow(),
+ 'title': config['meta']['title'],
+ 'blurb': config['meta']['blurb'],
+ 'encoding': _ENCODING,
+ 'inter_message_padding': '0.25em',
+ 'border_radius': '0.5em',
+ }
+
+_PAGES['text'] = Page()
+_PAGES['html'] = HtmlPage(
+ header='''
+
+
+
+ {title}
+{blurb}
+
Generated: {date} + + +'''.format(**context), + ) if args.list_views: for view in config['views']: