X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=notmuch-to-html;h=498921565379514b59e18ce83d532e8dd0d895d6;hb=158211a970cc971fda6f236ce0bcbcce6ba6dad8;hp=edf5c974294d5fe80bfdd604e5fb0a5fb77fd73a;hpb=9fd617756c66dfb10f21dfc6c905c34bc5fb61ac;p=obsolete%2Fnotmuch-to-html

diff --git a/notmuch-to-html b/notmuch-to-html
index edf5c97..4989215 100755
--- a/notmuch-to-html
+++ b/notmuch-to-html
@@ -45,6 +45,22 @@ import xml.sax.saxutils
 _ENCODING = 'UTF-8'
 _PAGES = {}
 
+DEFAULT_CONFIG='''
+{{
+    "meta": {{
+        "title": "Page title",
+        "blurb": "Page description"
+    }},
+
+    "views": [
+	{{
+	    "title": "View title",
+	    "comment": "View description",
+	    "query": [ "{query}" ]
+	}}
+    ]
+}}'''
+
 
 if not hasattr(collections, 'OrderedDict'):  # Python 2.6 or earlier
     class _OrderedDict (dict):
@@ -240,17 +256,29 @@ class HtmlPage (Page):
         return self._slug_regexp.sub('-', string)
 
 parser = argparse.ArgumentParser()
-parser.add_argument('config', help='path to configuration file', metavar='CONFIG_FILE')
 parser.add_argument('--text', help='output plain text format',
                     action='store_true')
+group = parser.add_mutually_exclusive_group()
+group.add_argument('--config', help='path to configuration file',
+                   metavar='PATH')
+group.add_argument('--query', help='path to configuration 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.config):
+    config = read_config(path=args.config)
+elif (args.query):
+    config = json.loads(DEFAULT_CONFIG.format(query=args.query))
+else:
+    print ('''To use notmuch-to-html, you need to provide a notmuch query. Try:
+
+	notmuch-to-html --query=tag:inbox
+
+Or 'notmuch-to-html --help' for additional options.''')
+    exit (0)
 
 _PAGES['text'] = Page()
 _PAGES['html'] = HtmlPage(
@@ -303,18 +331,17 @@ _PAGES['html'] = HtmlPage(
            encoding=_ENCODING,
            inter_message_padding='0.25em',
            border_radius='0.5em'),
-    footer='<hr><p>Generated: {date}</body>\n</html>\n'.format(date=datetime.datetime.utcnow().date())
+    footer='''<hr>
+<p>Generated: {date} courtesy of <a href="http://notmuchmail.org">notmuch</a> and <a href="http://git.cworth.org/git/notmuch-to-html">notmuch-to-html</a>.
+</body>
+</html>
+'''.format(date=datetime.datetime.utcnow().date())
     )
 
 if args.list_views:
     for view in config['views']:
         print(view['title'])
     sys.exit(0)
-elif args.get_query != None:
-    for view in config['views']:
-        if args.get_query == view['title']:
-            print(' and '.join(view['query']))
-    sys.exit(0)
 else:
     # only import notmuch if needed
     import notmuch
@@ -326,3 +353,12 @@ else:
 
 db = notmuch.Database(mode=notmuch.Database.MODE.READ_ONLY)
 page.write(database=db, views=config['views'])
+
+if (args.query):
+    print ('''To customize the output use 'notmuch-to-html --config=CONFIG_FILE' after
+placing the following content into CONFIG_FILE (note that you can add
+additional views with their own queries):
+
+
+''', file=sys.stderr)
+    print (json.dumps(config, indent=4, separators=(',',':')), file=sys.stderr)