nmbug-status: make output title and blurb configurable

[notmuch] / devel / nmbug / nmbug-status
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status

index 018f1911988018fa278d81026f91584ff7414c56..03621bd534491b185db4dbbc63e4ad38b52b6d14 100755 (executable)
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -13,7 +13,6 @@ import codecs
  import collections
  import datetime
  import email.utils
-import locale
  try:  # Python 3
      from urllib.parse import quote
  except ImportError:  # Python 2
@@ -27,7 +26,7 @@ import subprocess
  import xml.sax.saxutils
  
  
-_ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding()
+_ENCODING = 'UTF-8'
  _PAGES = {}
  
  
@@ -42,7 +41,7 @@ if not hasattr(collections, 'OrderedDict'):  # Python 2.6 or earlier
              super(_OrderedDict, self).__setitem__(key, value)
              self._keys.append(key)
  
-        def __values__(self):
+        def values(self):
              for key in self._keys:
                  yield self[key]
  
@@ -90,7 +89,7 @@ class Page (object):
                  byte_stream = sys.stdout.buffer
              except AttributeError:  # Python 2
                  byte_stream = sys.stdout
-            stream = codecs.getwriter(encoding='UTF-8')(stream=byte_stream)
+            stream = codecs.getwriter(encoding=_ENCODING)(stream=byte_stream)
          self._write_header(views=views, stream=stream)
          for view in views:
              self._write_view(database=database, view=view, stream=stream)
@@ -243,14 +242,27 @@ class HtmlPage (Page):
      def _slug(self, string):
          return self._slug_regexp.sub('-', string)
  
+parser = argparse.ArgumentParser()
+parser.add_argument('--text', help='output plain text format',
+                    action='store_true')
+parser.add_argument('--config', help='load config from given file',
+                    metavar='PATH')
+parser.add_argument('--list-views', help='list views',
+                    action='store_true')
+parser.add_argument('--get-query', help='get query for view',
+                    metavar='VIEW')
+
+args = parser.parse_args()
+
+config = read_config(path=args.config)
  
  _PAGES['text'] = Page()
  _PAGES['html'] = HtmlPage(
      header='''<!DOCTYPE html>
  <html lang="en">
  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>Notmuch Patches</title>
+  <meta http-equiv="Content-Type" content="text/html; charset={encoding}" />
+  <title>{title}</title>
    <style media="screen" type="text/css">
      table {{
        border-spacing: 0;
@@ -286,33 +298,21 @@ _PAGES['html'] = HtmlPage(
    </style>
  </head>
  <body>
-<h2>Notmuch Patches</h2>
+<h2>{title}</h2>
  <p>
  Generated: {date}<br />
-For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>
+{blurb}
  </p>
  <h3>Views</h3>
  '''.format(date=datetime.datetime.utcnow().date(),
+           title=config['meta']['title'],
+           blurb=config['meta']['blurb'],
+           encoding=_ENCODING,
             inter_message_padding='0.25em',
             border_radius='0.5em'),
      footer='</body>\n</html>\n',
      )
  
-
-parser = argparse.ArgumentParser()
-parser.add_argument('--text', help='output plain text format',
-                    action='store_true')
-parser.add_argument('--config', help='load config from given file',
-                    metavar='PATH')
-parser.add_argument('--list-views', help='list views',
-                    action='store_true')
-parser.add_argument('--get-query', help='get query for view',
-                    metavar='VIEW')
-
-args = parser.parse_args()
-
-config = read_config(path=args.config)
-
  if args.list_views:
      for view in config['views']:
          print(view['title'])