[PATCH 0/3] nmbug-status: add support for querying the search views

[PATCH 0/3] nmbug-status: add support for querying the search views

[Jani Nikula]

These should be helpful in a devel script that I've been hacking. It's
surprisingly painful to try to read json from shell scripts.

Cheers,
Jani.


Jani Nikula (3):
  nmbug-status: simplify config file read from nmbug git
  nmbug-status: add support for querying the search views
  nmbug-status: only import notmuch when needed

 devel/nmbug/nmbug-status |   30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

-- 
1.7.10.4

[PATCH 1/3] nmbug-status: simplify config file read from nmbug git

[Jani Nikula]

This should be functionally the same as before.
---
 devel/nmbug/nmbug-status |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index d08ca08..0283013 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -32,16 +32,8 @@ if args.config != None:
     fp = open(args.config)
 else:
     nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug'))
-
-    # read only the first line from the pipe
-    sha1 = subprocess.Popen(['git', '--git-dir', nmbhome,
-                             'show-ref', '-s', 'config'],
-                            stdout=subprocess.PIPE).stdout.readline()
-
-    sha1 = sha1.rstrip()
-
     fp = subprocess.Popen(['git', '--git-dir', nmbhome,
-                           'cat-file', 'blob', sha1+':status-config.json'],
+                           'show', 'config:status-config.json'],
                           stdout=subprocess.PIPE).stdout
 
 config = json.load(fp)
-- 
1.7.10.4

[PATCH 2/3] nmbug-status: add support for querying the search views

[Jani Nikula]

Make it easy for scripts to read the views and corresponding searches.
---
 devel/nmbug/nmbug-status |   16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 0283013..d83ca2d 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -13,6 +13,7 @@ import urllib
 import json
 import argparse
 import os
+import sys
 import subprocess
 
 # parse command line arguments
@@ -20,9 +21,10 @@ import subprocess
 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')
-
+parser.add_argument('--list-views', help='list views',
+                    action='store_true')
+parser.add_argument('--get-query', help='get query for view')
 
 args = parser.parse_args()
 
@@ -38,6 +40,16 @@ else:
 
 config = json.load(fp)
 
+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)
+
 if args.text:
     output_format = 'text'
 else:
-- 
1.7.10.4

[PATCH 3/3] nmbug-status: only import notmuch when needed

[Jani Nikula]

Make it possible to use the script to query search views without
notmuch python bindings installed.
---
 devel/nmbug/nmbug-status |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index d83ca2d..775f8ec 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -7,7 +7,6 @@
 #       - argparse; either python 2.7, or install separately
 
 import datetime
-import notmuch
 import rfc822
 import urllib
 import json
@@ -49,6 +48,9 @@ elif args.get_query != None:
         if args.get_query == view['title']:
             print ' and '.join(view['query'])
     sys.exit(0)
+else:
+    # only import notmuch if needed
+    import notmuch
 
 if args.text:
     output_format = 'text'
-- 
1.7.10.4

Re: [PATCH 0/3] nmbug-status: add support for querying the search views

[Tomi Ollila]

On Mon, Apr 01 2013, Jani Nikula <jani@nikula.org> wrote:

> These should be helpful in a devel script that I've been hacking. It's
> surprisingly painful to try to read json from shell scripts.
>
> Cheers,
> Jani.

+1

Tomi


>
>
> Jani Nikula (3):
>   nmbug-status: simplify config file read from nmbug git
>   nmbug-status: add support for querying the search views
>   nmbug-status: only import notmuch when needed
>
>  devel/nmbug/nmbug-status |   30 ++++++++++++++++++------------
>  1 file changed, 18 insertions(+), 12 deletions(-)
>
> -- 
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/3] nmbug-status: simplify config file read from nmbug git

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> This should be functionally the same as before.
> ---

Except that if a local config branch does not exist (but the remote one
does) the old complicated version works, while the new one does ont. Do
you want to try again, or just go with the other two patches?

d

Re: [PATCH 1/3] nmbug-status: simplify config file read from nmbug git

[Jani Nikula]

On Mon, 01 Apr 2013, David Bremner <david@tethera.net> wrote:
> Jani Nikula <jani@nikula.org> writes:
>
>> This should be functionally the same as before.
>> ---
>
> Except that if a local config branch does not exist (but the remote one
> does) the old complicated version works, while the new one does ont. Do
> you want to try again, or just go with the other two patches?

Right. Thanks for the explanation. Let's just drop this patch.

BR,
Jani.

Re: [PATCH 3/3] nmbug-status: only import notmuch when needed

[David Bremner]

Jani Nikula <jani@nikula.org> writes:

> Make it possible to use the script to query search views without
> notmuch python bindings installed.

Pushed 2 and 3

d