vim/vim-gnupg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull the key pattern out to a constant

Browse Source 
Signed-off-by: James McCoy <vega.james@gmail.com>
This commit is contained in:
James McCoy 2012-05-30 23:48:24 -04:00
parent ac45a5969e
commit b2b4e7525c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/gnupg.vim
View File

@ -172,6 +172,7 @@ augroup END
" Section: Constants {{{1 " Section: Constants {{{1
let s:GPGMagicString = "\t \t" let s:GPGMagicString = "\t \t"
let s:keyPattern = '\%(0x\)\=[[:xdigit:]]\{8,16}'
" Section: Highlight setup {{{1 " Section: Highlight setup {{{1
@ -381,7 +382,7 @@ function s:GPGDecrypt(bufread)
" the contents of a file into a buffer " the contents of a file into a buffer
let silent = a:bufread ? 'silent ' : '' let silent = a:bufread ? 'silent ' : ''
let asymmPattern = 'gpg: public key is \%(0x\)\=[[:xdigit:]]\{8,16}' let asymmPattern = 'gpg: public key is ' . s:keyPattern
" check if the file is symmetric/asymmetric encrypted " check if the file is symmetric/asymmetric encrypted
if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0) if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0)
" file is symmetric encrypted " file is symmetric encrypted
@ -412,7 +413,7 @@ function s:GPGDecrypt(bufread)
let start = match(output, asymmPattern) let start = match(output, asymmPattern)
while (start >= 0) while (start >= 0)
let start = start + strlen("gpg: public key is ") let start = start + strlen("gpg: public key is ")
let recipient = matchstr(output, '[[:xdigit:]]\{8,16}', start) let recipient = matchstr(output, s:keyPattern, start)
call s:GPGDebug(1, "recipient is " . recipient) call s:GPGDebug(1, "recipient is " . recipient)
let name = s:GPGNameToID(recipient) let name = s:GPGNameToID(recipient)
if (strlen(name) > 0) if (strlen(name) > 0)