X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug-status;h=6a156af28250e5309a968d1791be38da29c2e00a;hb=aa32d2579b0aa4c8c8a31a1d6060445b254b2be2;hp=57f16e25d48bc944e291cb5d2fa93b97d03a5c10;hpb=c48a12365fba12a8ec0922a011a86ee15bc5cc8f;p=notmuch
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 57f16e25..6a156af2 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -21,6 +21,7 @@ except ImportError: # Python 2
import json
import argparse
import os
+import re
import sys
import subprocess
@@ -168,24 +169,32 @@ class Page (object):
class HtmlPage (Page):
+ _slug_regexp = re.compile('\W+')
+
def _write_header(self, views, stream):
super(HtmlPage, self)._write_header(views=views, stream=stream)
stream.write('\n')
for view in views:
+ if 'id' not in view:
+ view['id'] = self._slug(view['title'])
stream.write(
- '- {title}
\n'.format(**view))
+ '- {title}
\n'.format(**view))
stream.write('
\n')
def _write_view_header(self, view, stream):
- stream.write('{title}
\n'.format(**view))
+ 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')
@@ -197,12 +206,14 @@ class HtmlPage (Page):
for thread in threads:
for message_display_data in thread:
stream.write((
- '| {date}\n'
- ' | {message-id-term}\n'
- ' |
\n'
- '| {from}\n'
- ' | {subject}\n'
- ' |
\n'
+ '\n'
+ ' | {date} | \n'
+ ' {message-id-term} | \n'
+ '
\n'
+ '\n'
+ ' | {from} | \n'
+ ' {subject} | \n'
+ '
\n'
).format(**message_display_data))
if thread != threads[-1]:
stream.write('
|
\n')
@@ -222,20 +233,24 @@ class HtmlPage (Page):
).format(**d)
return (running_data, display_data)
+ def _slug(self, string):
+ return self._slug_regexp.sub('-', string)
+
_PAGES['text'] = Page()
_PAGES['html'] = HtmlPage(
- header='''
-
-
+ header='''
+
Notmuch Patches
Notmuch Patches
+
Generated: {date}
For more infomation see nmbug
+
Views
'''.format(date=datetime.datetime.utcnow().date()),
footer='\n\n',