X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug-status;h=018f1911988018fa278d81026f91584ff7414c56;hb=0d563dae1d86f22b10981e99d69d0eb0b69a131d;hp=9fde20ec786cb549c13cc349fa889e5453d31a9a;hpb=711d04c8214f487e57c4bbc26b4433c5e6f099ce;p=notmuch diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 9fde20ec..018f1911 100755 --- a/devel/nmbug/nmbug-status +++ b/devel/nmbug/nmbug-status @@ -24,6 +24,7 @@ import os import re import sys import subprocess +import xml.sax.saxutils _ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding() @@ -183,14 +184,18 @@ class HtmlPage (Page): def _write_view_header(self, view, stream): stream.write('

{title}

\n'.format(**view)) + stream.write('

\n') if 'comment' in view: stream.write(view['comment']) stream.write('\n') for line in [ 'The view is generated from the following query:', - '

', + '

', + '

', + ' ', view['query-string'], - '

', + ' ', + '

', ]: stream.write(line) stream.write('\n') @@ -200,19 +205,22 @@ class HtmlPage (Page): return stream.write('\n') for thread in threads: + stream.write(' \n') for message_display_data in thread: stream.write(( - '\n' - ' \n' - ' \n' - '\n' - '\n' - ' \n' - ' \n' - '\n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' + ' \n' ).format(**message_display_data)) + stream.write(' \n') if thread != threads[-1]: - stream.write('\n') + stream.write( + ' \n') stream.write('
{date}{message-id-term}
{from}{subject}
{date}{message-id-term}
{from}{subject}


\n') def _message_display_data(self, *args, **kwargs): @@ -222,11 +230,14 @@ 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): @@ -238,15 +249,52 @@ _PAGES['html'] = HtmlPage( header=''' - -Notmuch Patches + + Notmuch Patches +

Notmuch Patches

+

Generated: {date}
For more infomation see nmbug +

Views

-'''.format(date=datetime.datetime.utcnow().date()), +'''.format(date=datetime.datetime.utcnow().date(), + inter_message_padding='0.25em', + border_radius='0.5em'), footer='\n\n', )