From: "W. Trevor King" <wking@tremily.us>
To: notmuch@notmuchmail.org
Subject: [PATCH 06/17] nmbug-status: Consolidate functions and main code
Date: Mon, 3 Feb 2014 02:59:24 -0800 [thread overview]
Message-ID: <43b389b156214bb07c09f36cd36fd9fa2ccebf5b.1391424512.git.wking@tremily.us> (raw)
In-Reply-To: <cover.1391424512.git.wking@tremily.us>
In-Reply-To: <cover.1391424512.git.wking@tremily.us>
The definitions of Thread, output_with_separator, and print_view were
between the main argparse and view-printing code. Group them together
with our existing read_config at the top of the module, which makes
for easier reading in the main section.
I also:
* Made 'headers' a print_view argument instead of a module-level
global. The list -> tuple conversion avoids having a mutable
default argument, which makes some people jumpy ;).
* Made 'db' a print_view argument instead of relying on the global
namespace to access it from print_view.
---
devel/nmbug/nmbug-status | 78 +++++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status
index 22eeb5c..199892f 100755
--- a/devel/nmbug/nmbug-status
+++ b/devel/nmbug/nmbug-status
@@ -47,40 +47,6 @@ def read_config(path=None, encoding=None):
return json.load(fp)
-# parse command line arguments
-
-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'])
- 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
-
-if args.text:
- output_format = 'text'
-else:
- output_format = 'html'
-
class Thread:
def __init__(self, last, lines):
self.last = last
@@ -89,16 +55,17 @@ class Thread:
def join_utf8_with_newlines(self):
return '\n'.join( (line.encode('utf-8') for line in self.lines) )
+
def output_with_separator(threadlist, sep):
outputs = (thread.join_utf8_with_newlines() for thread in threadlist)
print(sep.join(outputs))
-headers = ['date', 'from', 'subject']
-def print_view(title, query, comment):
+def print_view(database, title, query, comment,
+ headers=('date', 'from', 'subject')):
query_string = ' and '.join(query)
- q_new = notmuch.Query(db, query_string)
+ q_new = notmuch.Query(database, query_string)
q_new.set_sort(notmuch.Query.SORT.OLDEST_FIRST)
last_thread_id = ''
@@ -176,6 +143,41 @@ def print_view(title, query, comment):
else:
output_with_separator(threadlist, '\n\n')
+
+# parse command line arguments
+
+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'])
+ 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
+
+if args.text:
+ output_format = 'text'
+else:
+ output_format = 'html'
+
# main program
db = notmuch.Database(mode=notmuch.Database.MODE.READ_WRITE)
@@ -200,7 +202,7 @@ if output_format == 'html':
print('</ul>')
for view in config['views']:
- print_view(**view)
+ print_view(database=db, **view)
if output_format == 'html':
print('</body>\n</html>')
--
1.8.5.2.8.g0f6c0d1
next prev parent reply other threads:[~2014-02-03 11:08 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-03 10:59 [PATCH 00/17] nmbug-status: Python-3-compabitility and general refactoring W. Trevor King
2014-02-03 10:59 ` [PATCH 01/17] nmbug-status: Convert to Python-3-compatible print functions W. Trevor King
2014-02-03 10:59 ` [PATCH 02/17] nmbug-status: Use email.utils instead of rfc822 W. Trevor King
2014-02-03 10:59 ` [PATCH 03/17] nmbug-status: Decode Popen output using the user's locale W. Trevor King
2014-02-03 10:59 ` [PATCH 04/17] nmbug-status: Factor config-loading out into read_config W. Trevor King
2014-02-03 10:59 ` [PATCH 05/17] nmbug-status: Add metavars for --config and --get-query W. Trevor King
2014-02-03 10:59 ` W. Trevor King [this message]
2014-02-03 10:59 ` [PATCH 07/17] nmbug-status: Don't require write access W. Trevor King
2014-02-03 10:59 ` [PATCH 08/17] nmbug-status: Consolidate HTML header printing W. Trevor King
2014-02-03 10:59 ` [PATCH 09/17] nmbug-status: Add a Python-3-compatible urllib.parse.quote import W. Trevor King
2014-02-03 10:59 ` [PATCH 10/17] nmbug-status: Add Page and HtmlPage for modular rendering W. Trevor King
2014-02-03 10:59 ` [PATCH 11/17] nmbug-status: Normalize table HTML indentation W. Trevor King
2014-02-03 10:59 ` [PATCH 12/17] nmbug-status: Convert from XHTML 1.0 to HTML 5 W. Trevor King
2014-02-03 10:59 ` [PATCH 13/17] nmbug-status: Encode output using the user's locale W. Trevor King
2014-02-03 10:59 ` [PATCH 14/17] nmbug-status: Anchor with h3 ids instead of a names W. Trevor King
2014-02-03 10:59 ` [PATCH 15/17] nmbug-status: Quote the title when using it as an id W. Trevor King
2014-02-08 23:18 ` W. Trevor King
2014-02-09 9:34 ` Tomi Ollila
2014-02-03 10:59 ` [PATCH 16/17] nmbug-status: Use <code> and <p> markup where appropriate W. Trevor King
2014-02-03 10:59 ` [PATCH 17/17] nmbug-status: Color threads in HTML output W. Trevor King
2014-02-03 21:10 ` [PATCH 00/17] nmbug-status: Python-3-compabitility and general refactoring Tomi Ollila
2014-02-04 0:53 ` W. Trevor King
2014-02-04 10:30 ` Tomi Ollila
2014-02-04 13:07 ` David Bremner
2014-02-04 15:50 ` W. Trevor King
2014-02-04 17:39 ` W. Trevor King
2014-02-04 16:11 ` W. Trevor King
2014-02-04 18:40 ` Tomi Ollila
2014-02-04 19:14 ` W. Trevor King
2014-02-04 20:06 ` Tomi Ollila
2014-02-05 15:00 ` Tomi Ollila
2014-02-05 15:24 ` Tomi Ollila
2014-02-05 15:31 ` W. Trevor King
2014-02-07 22:15 ` W. Trevor King
2014-02-05 15:27 ` W. Trevor King
2014-02-05 22:54 ` Tomi Ollila
2014-02-06 18:14 ` W. Trevor King
2014-02-08 16:11 ` David Bremner
[not found] ` <87ob2hogkr.fsf@zancas.localnet>
2014-02-08 17:16 ` W. Trevor King
2014-02-08 18:29 ` Tomi Ollila
2014-02-08 19:09 ` W. Trevor King
2014-02-08 19:37 ` Tomi Ollila
2014-02-08 22:19 ` W. Trevor King
2014-02-04 17:48 ` W. Trevor King
2014-02-04 18:34 ` Tomi Ollila
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43b389b156214bb07c09f36cd36fd9fa2ccebf5b.1391424512.git.wking@tremily.us \
--to=wking@tremily.us \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).