From a255a72200b1c5bf0abc2936579f0db0b8b17899 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Tue, 11 Feb 2014 10:40:25 +1600 Subject: [PATCH] [PATCH v2 04/20] nmbug-status: Factor config-loading out into read_config --- f3/66d01fff42971c15e67cde0e0d55eb00ed41af | 143 ++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 f3/66d01fff42971c15e67cde0e0d55eb00ed41af diff --git a/f3/66d01fff42971c15e67cde0e0d55eb00ed41af b/f3/66d01fff42971c15e67cde0e0d55eb00ed41af new file mode 100644 index 000000000..717467392 --- /dev/null +++ b/f3/66d01fff42971c15e67cde0e0d55eb00ed41af @@ -0,0 +1,143 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 5FAE6431FAF + for ; Mon, 10 Feb 2014 10:42:08 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id O4lVNyLvDpbZ for ; + Mon, 10 Feb 2014 10:42:03 -0800 (PST) +Received: from qmta10.westchester.pa.mail.comcast.net + (qmta10.westchester.pa.mail.comcast.net [76.96.62.17]) + by olra.theworths.org (Postfix) with ESMTP id 85E00431FC2 + for ; Mon, 10 Feb 2014 10:41:55 -0800 (PST) +Received: from omta11.westchester.pa.mail.comcast.net ([76.96.62.36]) + by qmta10.westchester.pa.mail.comcast.net with comcast + id Qhok1n00D0mv7h05AihvE0; Mon, 10 Feb 2014 18:41:55 +0000 +Received: from odin.tremily.us ([24.18.63.50]) + by omta11.westchester.pa.mail.comcast.net with comcast + id Qiht1n00b152l3L3XihuvE; Mon, 10 Feb 2014 18:41:55 +0000 +Received: from mjolnir.tremily.us (unknown [192.168.0.140]) + by odin.tremily.us (Postfix) with ESMTPS id B489410167A9; + Mon, 10 Feb 2014 10:41:53 -0800 (PST) +Received: (nullmailer pid 1250 invoked by uid 1000); + Mon, 10 Feb 2014 18:40:44 -0000 +From: "W. Trevor King" +To: notmuch@notmuchmail.org +Subject: [PATCH v2 04/20] nmbug-status: Factor config-loading out into + read_config +Date: Mon, 10 Feb 2014 10:40:25 -0800 +Message-Id: + <65fe8d8f253ba3dfa48f89193765ba16f44b4f81.1392056624.git.wking@tremily.us> +X-Mailer: git-send-email 1.8.5.2.8.g0f6c0d1 +In-Reply-To: +References: +In-Reply-To: +References: +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; + s=q20121106; t=1392057715; + bh=7QgiYpMpmn8WqWRsOxQXygu5qDb5C0F7IAUnsXEftMU=; + h=Received:Received:Received:Received:From:To:Subject:Date: + Message-Id; + b=pU+iK8OWQtxdPVhjt1I0b/x2nif7S0IvKXPPZPNXY7DRAKWpcdb9gLQnlbfcoDXMi + sjVfaitTQBfs+kNSJKLQgcSsJswH7FeYVUNoitSh73JvjRP9aLKkd4spqClogwtzOZ + Ee6IFXk+Ynx/5851vwYPYnGTGAkDfI2epebSLTuB2AdbYkATCkq2ZMOPoYxS0TvD2H + hFDwDs5gRyJaRk2hFCOvk8pzukgJ95yauCm7yfIxRiYVCzFM9NWjWTWAmTzQxvtMbt + lHIK7SWWRwO7b4Xmtg5qkVbokc+TiUzjiiQuUB1z9EC3orwW6ClnNYQUD9vEtNe7y1 + mYE63qqFcyaIQ== +Cc: Tomi Ollila +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 10 Feb 2014 18:42:08 -0000 + +By isolating this peripheral handling, we make the core logic of +nmbug-status easier to read. +--- + devel/nmbug/nmbug-status | 45 +++++++++++++++++++++++++-------------------- + 1 file changed, 25 insertions(+), 20 deletions(-) + +diff --git a/devel/nmbug/nmbug-status b/devel/nmbug/nmbug-status +index a7a391d..6dfbe4d 100755 +--- a/devel/nmbug/nmbug-status ++++ b/devel/nmbug/nmbug-status +@@ -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']: +-- +1.8.5.2.8.g0f6c0d1 + -- 2.26.2