X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=devel%2Fnmbug%2Fnmbug-status;h=199892f78711eadf748399c842b80f39a96c3b26;hb=e4d79bfddb7e8f34f991c9d4ee0256c530187c23;hp=6525176478d2155d274f63184d3c3057b8ace25e;hpb=ee6b5c372f724d2352d155736b81d2d46130c929;p=notmuch diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status index 65251764..199892f7 100755 --- a/devel/nmbug/nmbug-status +++ b/devel/nmbug/nmbug-status @@ -8,8 +8,10 @@ from __future__ import print_function +import codecs import datetime import email.utils +import locale import urllib import json import argparse @@ -17,55 +19,33 @@ import os import sys import subprocess -# 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') -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() +_ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding() -# read config from json file -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() +def read_config(path=None, encoding=None): + "Read config from json file" + if not encoding: + encoding = _ENCODING + if path: + fp = open(path) + else: + nmbhome = os.getenv('NMBGIT', os.path.expanduser('~/.nmbug')) - fp = subprocess.Popen(['git', '--git-dir', nmbhome, - 'cat-file', 'blob', sha1+':status-config.json'], - stdout=subprocess.PIPE).stdout + # read only the first line from the pipe + sha1_bytes = subprocess.Popen( + ['git', '--git-dir', nmbhome, 'show-ref', '-s', 'config'], + stdout=subprocess.PIPE).stdout.readline() + sha1 = sha1_bytes.decode(encoding).rstrip() -config = json.load(fp) + fp_byte_stream = subprocess.Popen( + ['git', '--git-dir', nmbhome, 'cat-file', 'blob', + sha1+':status-config.json'], + stdout=subprocess.PIPE).stdout + fp = codecs.getreader(encoding=encoding)(stream=fp_byte_stream) -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 + return json.load(fp) -if args.text: - output_format = 'text' -else: - output_format = 'html' class Thread: def __init__(self, last, lines): @@ -75,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 = '' @@ -162,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) @@ -186,7 +202,7 @@ if output_format == 'html': print('') for view in config['views']: - print_view(**view) + print_view(database=db, **view) if output_format == 'html': print('\n')