debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-03-14 03:25:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nmbug-status: Factor config-loading out into read_config

Browse source 
By isolating this peripheral handling, we make the core logic of
nmbug-status easier to read.
This commit is contained in:
W. Trevor King 2014-02-10 10:40:25 -08:00 • committed by David Bremner
parent fd29d3f4fb
commit b7e6d2cc30
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
devel/nmbug/nmbug-status
View file

@ -23,6 +23,30 @@ import subprocess
_ENCODING = locale.getpreferredencoding() or sys.getdefaultencoding()
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'))
# 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()
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)
return json.load(fp)
# parse command line arguments
parser = argparse.ArgumentParser()
@ -35,26 +59,7 @@ parser.add_argument('--get-query', help='get query for view')
args = parser.parse_args()
# 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_bytes = subprocess.Popen(
['git', '--git-dir', nmbhome, 'show-ref', '-s', 'config'],
stdout=subprocess.PIPE).stdout.readline()
sha1 = sha1_bytes.decode(_ENCODING).rstrip()
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)
config = json.load(fp)
config = read_config(path=args.config)
if args.list_views:
for view in config['views']: