unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH 0/2] nmbug-status: make title/blurb configurable
@ 2014-03-13 12:04 Jani Nikula
  2014-03-13 12:04 ` [PATCH 1/2] nmbug-status: parametrize title and blurb in the page header Jani Nikula
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Jani Nikula @ 2014-03-13 12:04 UTC (permalink / raw)
  To: notmuch

This lets me use nmbug-status for publishing search views in html
outside of the nmbug context. I'm sure especially 2/2 can be done
better. If someone wants to use their mad python skillz to improve this,
it would be great. ;)

BR,
Jani.


Jani Nikula (2):
  nmbug-status: parametrize title and blurb in the page header
  nmbug-status: make output title and blurb configurable

 devel/nmbug/nmbug-status       |   36 ++++++++++++++++++------------------
 devel/nmbug/status-config.json |    5 +++++
 2 files changed, 23 insertions(+), 18 deletions(-)

-- 
1.7.2.5

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/2] nmbug-status: parametrize title and blurb in the page header
  2014-03-13 12:04 [PATCH 0/2] nmbug-status: make title/blurb configurable Jani Nikula
@ 2014-03-13 12:04 ` Jani Nikula
  2014-03-13 12:04 ` [PATCH 2/2] nmbug-status: make output title and blurb configurable Jani Nikula
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2014-03-13 12:04 UTC (permalink / raw)
  To: notmuch

Prepare for more general use.
---
 devel/nmbug/nmbug-status |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 6b2572c..cb3901f 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -249,7 +249,7 @@ _PAGES['html'] = HtmlPage(
 <html lang="en">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset={encoding}" />
-  <title>Notmuch Patches</title>
+  <title>{title}</title>
   <style media="screen" type="text/css">
     table {{
       border-spacing: 0;
@@ -285,13 +285,15 @@ _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='Notmuch Patches',
+           blurb='For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>',
            encoding=_ENCODING,
            inter_message_padding='0.25em',
            border_radius='0.5em'),
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/2] nmbug-status: make output title and blurb configurable
  2014-03-13 12:04 [PATCH 0/2] nmbug-status: make title/blurb configurable Jani Nikula
  2014-03-13 12:04 ` [PATCH 1/2] nmbug-status: parametrize title and blurb in the page header Jani Nikula
@ 2014-03-13 12:04 ` Jani Nikula
  2014-03-13 14:33 ` [PATCH 0/2] nmbug-status: make title/blurb configurable W. Trevor King
  2014-03-23 11:50 ` David Bremner
  3 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2014-03-13 12:04 UTC (permalink / raw)
  To: notmuch

Make nmbug-status more generally usable outside of nmbug by not
hardcoding notmuch related things.

This lets anyone publish html search views to mailing list messages
with a custom config file, independent of nmbug.
---
 devel/nmbug/nmbug-status       |   32 +++++++++++++++-----------------
 devel/nmbug/status-config.json |    5 +++++
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index cb3901f..03621bd 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -242,6 +242,19 @@ 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(
@@ -292,29 +305,14 @@ Generated: {date}<br />
 </p>
 <h3>Views</h3>
 '''.format(date=datetime.datetime.utcnow().date(),
-           title='Notmuch Patches',
-           blurb='For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>',
+           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'])
diff --git a/devel/nmbug/status-config.json b/devel/nmbug/status-config.json
index 6b4934f..3f02c81 100644
--- a/devel/nmbug/status-config.json
+++ b/devel/nmbug/status-config.json
@@ -1,4 +1,9 @@
 {
+    "meta": {
+        "title": "Notmuch Patches",
+        "blurb": "For more infomation see <a href="http://notmuchmail.org/nmbug">nmbug</a>"
+    },
+
     "views": [
 	{
 	    "comment": "Unresolved bugs (or just need tag updating).",
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/2] nmbug-status: make title/blurb configurable
  2014-03-13 12:04 [PATCH 0/2] nmbug-status: make title/blurb configurable Jani Nikula
  2014-03-13 12:04 ` [PATCH 1/2] nmbug-status: parametrize title and blurb in the page header Jani Nikula
  2014-03-13 12:04 ` [PATCH 2/2] nmbug-status: make output title and blurb configurable Jani Nikula
@ 2014-03-13 14:33 ` W. Trevor King
  2014-03-14  9:09   ` Jani Nikula
  2014-03-23 11:50 ` David Bremner
  3 siblings, 1 reply; 8+ messages in thread
From: W. Trevor King @ 2014-03-13 14:33 UTC (permalink / raw)
  To: Jani Nikula; +Cc: notmuch

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

On Thu, Mar 13, 2014 at 01:04:03PM +0100, Jani Nikula wrote:
> This lets me use nmbug-status for publishing search views in html
> outside of the nmbug context. I'm sure especially 2/2 can be done
> better. If someone wants to use their mad python skillz to improve
> this, it would be great. ;)

Both patches look good to me.  What don't you like about 2/2?

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/2] nmbug-status: make title/blurb configurable
  2014-03-13 14:33 ` [PATCH 0/2] nmbug-status: make title/blurb configurable W. Trevor King
@ 2014-03-14  9:09   ` Jani Nikula
  0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2014-03-14  9:09 UTC (permalink / raw)
  To: W. Trevor King; +Cc: notmuch

On Thu, 13 Mar 2014, "W. Trevor King" <wking@tremily.us> wrote:
> On Thu, Mar 13, 2014 at 01:04:03PM +0100, Jani Nikula wrote:
>> This lets me use nmbug-status for publishing search views in html
>> outside of the nmbug context. I'm sure especially 2/2 can be done
>> better. If someone wants to use their mad python skillz to improve
>> this, it would be great. ;)
>
> Both patches look good to me.  What don't you like about 2/2?

*shrug* I guess I'm just uneasy with languages I don't master. Let's go
with this then if you think it's good stuff.

David, note that we'll need to update the config in nmbug repo for this
as well.

BR,
Jani.



>
> Cheers,
> Trevor
>
> -- 
> This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
> For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/2] nmbug-status: make title/blurb configurable
  2014-03-13 12:04 [PATCH 0/2] nmbug-status: make title/blurb configurable Jani Nikula
                   ` (2 preceding siblings ...)
  2014-03-13 14:33 ` [PATCH 0/2] nmbug-status: make title/blurb configurable W. Trevor King
@ 2014-03-23 11:50 ` David Bremner
  2014-03-23 13:06   ` Jani Nikula
  3 siblings, 1 reply; 8+ messages in thread
From: David Bremner @ 2014-03-23 11:50 UTC (permalink / raw)
  To: Jani Nikula, notmuch

Jani Nikula <jani@nikula.org> writes:

> This lets me use nmbug-status for publishing search views in html
> outside of the nmbug context. I'm sure especially 2/2 can be done
> better. If someone wants to use their mad python skillz to improve this,
> it would be great. ;)

no mad python skillz were spotted, but I did correct a couple of typos
in status-config.json before pushing.

d

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/2] nmbug-status: make title/blurb configurable
  2014-03-23 11:50 ` David Bremner
@ 2014-03-23 13:06   ` Jani Nikula
  2014-03-23 14:38     ` David Bremner
  0 siblings, 1 reply; 8+ messages in thread
From: Jani Nikula @ 2014-03-23 13:06 UTC (permalink / raw)
  To: David Bremner, notmuch

On Sun, 23 Mar 2014, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>
>> This lets me use nmbug-status for publishing search views in html
>> outside of the nmbug context. I'm sure especially 2/2 can be done
>> better. If someone wants to use their mad python skillz to improve this,
>> it would be great. ;)
>
> no mad python skillz were spotted, but I did correct a couple of typos
> in status-config.json before pushing.

Ah, escaping. Thanks.

The config change needs to be pushed to the nmbug repo too before
upgrading notmuch on that server.

BR,
Jani.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/2] nmbug-status: make title/blurb configurable
  2014-03-23 13:06   ` Jani Nikula
@ 2014-03-23 14:38     ` David Bremner
  0 siblings, 0 replies; 8+ messages in thread
From: David Bremner @ 2014-03-23 14:38 UTC (permalink / raw)
  To: Jani Nikula, notmuch

Jani Nikula <jani@nikula.org> writes:

>
> The config change needs to be pushed to the nmbug repo too before
> upgrading notmuch on that server.
>

done already, but thanks for the hint.

d

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-03-23 14:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-13 12:04 [PATCH 0/2] nmbug-status: make title/blurb configurable Jani Nikula
2014-03-13 12:04 ` [PATCH 1/2] nmbug-status: parametrize title and blurb in the page header Jani Nikula
2014-03-13 12:04 ` [PATCH 2/2] nmbug-status: make output title and blurb configurable Jani Nikula
2014-03-13 14:33 ` [PATCH 0/2] nmbug-status: make title/blurb configurable W. Trevor King
2014-03-14  9:09   ` Jani Nikula
2014-03-23 11:50 ` David Bremner
2014-03-23 13:06   ` Jani Nikula
2014-03-23 14:38     ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).