From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19830 invoked by alias); 23 Jun 2018 17:26:53 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43094 Received: (qmail 22403 invoked by uid 1010); 23 Jun 2018 17:26:53 -0000 X-Qmail-Scanner-Diagnostics: from mail-wm0-f44.google.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(74.125.82.44):SA:0(-1.9/5.0):. Processed in 2.962704 secs); 23 Jun 2018 17:26:53 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 X-Envelope-From: doron.behar@gmail.com X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to:user-agent; bh=PlZBDCbNLOiofd1PyhxGHruBvQHKWYrW2gs/pRzRQhs=; b=mE6I4Y42IRYWGskduTVIZwmnar3YWUYKEQCHc2/UOwKtAuxS5rVcgqqJ5TRrjnvyYD nMDJCweTd2rzbD3Fau+Yf3ZSQ3wHObxtoC7VMgFmo+pAlJwS9dHLAjXNhDEaUazoEUBu CNj9qZHkfdJz/ACxkFW5wesCubJ8TqK2g9Tel+kDq/MHx3DXujbjWJB0LuP1RogYVzRQ oDV6RvTqOKG1G06JRi+v/deHP4490BpPxIJp4UeA4o5J971+0pX/smFmUVZCbmvrLRU3 lRHUhdULUDtOKsF13OLzycMj5tVCiEIYBXf0MLHIhAi2JGjWXGG5mbgjNLRgbKvrgoSB V+ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=PlZBDCbNLOiofd1PyhxGHruBvQHKWYrW2gs/pRzRQhs=; b=PCzs7ZRDBkGtKmooHynObgGtQttOe72i/rEyZpddrlELNJWRGl04D+g8TMvICT4aap 2GjAGgrKrIl+aA5PmzjahWrZaIzR1tAxQkHIiPJNPlXKyyeX6Um6Zdpog30oZ72MlLLx YQGaukv9vuNJYSqK2Zn8WGYLoLLvXJRyFa0NbI0BYMARbK+oq6hu9uktL4cUern4/Olk rj0jD4YwOHVKkWONeQSlRDghsdm2a8U+bGVfZvec2kr27ZYswcj6Zm2xJQsJWykqQ602 80DGpMw2vkU/EHyeMp8KWJmFRlkBzvfsgLA9vwb77FT1BGxb1acbO7NnfSoFmRI9eByg lYKA== X-Gm-Message-State: APt69E2bNTRytbVUKCc2TxdmwuY7CvPyvguvEGQh7Eq9Wv+a7Yq9+kUv xkohsC6F0DAlJXkIo/ytWoWMCubl X-Google-Smtp-Source: ADUXVKIKIyMHmoEq+KpJR+ByIW0SmArVjwqHNcTDaedmIu5DxPEZRgB6zJ291ytqeA2/J+6zoufuhA== X-Received: by 2002:a1c:d11:: with SMTP id 17-v6mr4788411wmn.81.1529774805974; Sat, 23 Jun 2018 10:26:45 -0700 (PDT) Date: Sat, 23 Jun 2018 20:26:37 +0300 From: Doron Behar To: zsh-workers@zsh.org Subject: Re: [PATCH] _gpg: Use explicit UIDs for state = public keys. Message-ID: <20180623172637.tt5xittrjfjhwboc@NUC.doronbehar.com> Mail-Followup-To: zsh-workers@zsh.org References: <20180618194748.4676-1-doron.behar@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180618194748.4676-1-doron.behar@gmail.com> User-Agent: NeoMutt/20180512 Hey guys, is this patch O.K? Can we merge it please? I've been waiting a while for a response now, it'll be great to get some feedback. On Mon, Jun 18, 2018 at 10:47:48PM +0300, doron.behar@gmail.com wrote: > From: Doron Behar > > Use the `--with-colons` option and parse the output according to the > format specified in the documentation. > --- > Completion/Unix/Command/_gpg | 62 ++++++++++++++++++++++++++++++++---- > 1 file changed, 55 insertions(+), 7 deletions(-) > > diff --git a/Completion/Unix/Command/_gpg b/Completion/Unix/Command/_gpg > index 48a36eff2..b35693d1f 100644 > --- a/Completion/Unix/Command/_gpg > +++ b/Completion/Unix/Command/_gpg > @@ -206,20 +206,68 @@ fi > > case "$state" in > public-keys) > - _wanted public-keys expl 'public key' \ > - compadd ${${(Mo)$(_call_program public-keys $words[1] $needed --list-public-keys --list-options no-show-photos):%<*>}//(<|>)/} && return > + local public_keys_lines=(${(f)"$(_call_program public-keys ${(q)words[1]} ${(q)needed} --list-public-keys --list-options no-show-photos --with-colons)"}) > + local -a uids emails > + local i j parts current_uid > + for (( i = 1; i < ${#public_keys_lines[@]}; ++i )); do > + parts=("${(@s.:.)public_keys_lines[$i]}") > + if [[ ${parts[1]} == "fpr" ]]; then > + current_uid="${parts[10]}" > + i=$((i + 1)) > + parts=("${(@s.:.)public_keys_lines[$i]}") > + while [[ ${parts[1]} == "uid" ]]; do > + uids+=("${current_uid}") > + emails+=("${parts[10]}") > + i=$((i + 1)) > + parts=("${(@s.:.)public_keys_lines[$i]}") > + done > + fi > + done > + _describe -t public-keys 'public key' emails uids > ;; > secret-keys) > - _wanted secret-keys expl 'secret key' compadd \ > - ${${(Mo)$(_call_program secret-keys $words[1] $needed --list-secret-keys --list-options no-show-photos):%<*>}//(<|>)/} && return > + local secret_keys_lines=(${(f)"$(_call_program secret-keys ${(q)words[1]} ${(q)needed} --list-secret-keys --list-options no-show-photos --with-colons)"}) > + local -a uids emails > + local i j parts current_uid > + for (( i = 1; i < ${#secret_keys_lines[@]}; ++i )); do > + parts=("${(@s.:.)secret_keys_lines[$i]}") > + if [[ ${parts[1]} == "fpr" ]]; then > + current_uid="${parts[10]}" > + i=$((i + 1)) > + parts=("${(@s.:.)secret_keys_lines[$i]}") > + while [[ ${parts[1]} == "uid" ]]; do > + uids+=("${current_uid}") > + emails+=("${parts[10]}") > + i=$((i + 1)) > + parts=("${(@s.:.)secret_keys_lines[$i]}") > + done > + fi > + done > + _describe -t secret-keys 'secret key' emails uids > ;; > ciphers) > _wanted ciphers expl cipher compadd \ > - ${${(s.,.)${(M)${(f)${"$(_call_program ciphers $words[1] $needed --version)"}//,$'\n' #/, }:#Cipher*}#*:}# } && return > + ${${(s.,.)${(M)${(f)${"$(_call_program ciphers ${(q)words[1]} ${(q)needed} --version)"}//,$'\n' #/, }:#Cipher*}#*:}# } && return > ;; > (public-keyids) > - _wanted public-keys expl 'public keyid' \ > - compadd ${(M)${${(f)"$(_call_program public-keyids $words[1] $needed --list-public-keys --list-options no-show-photos)"}## #}:#[0-9A-F](#c40)} && return > + local public_keys_lines=(${(f)"$(_call_program public-keyids ${(q)words[1]} ${(q)needed} --list-public-keys --list-options no-show-photos --with-colons)"}) > + local -a uids emails > + local i j parts current_uid > + for (( i = 1; i < ${#public_keys_lines[@]}; ++i )); do > + parts=("${(@s.:.)public_keys_lines[$i]}") > + if [[ ${parts[1]} == "fpr" ]]; then > + current_uid="${parts[10]}" > + i=$((i + 1)) > + parts=("${(@s.:.)public_keys_lines[$i]}") > + while [[ ${parts[1]} == "uid" ]]; do > + uids+=("${current_uid}") > + emails+=("${parts[10]}") > + i=$((i + 1)) > + parts=("${(@s.:.)public_keys_lines[$i]}") > + done > + fi > + done > + _describe -t public-keyids 'public key' emails uids > ;; > (option-list) > _sequence _wanted options expl option \ > -- > 2.17.1 >