emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(pass): make duplicate functions obsolete

Browse source 
The following functions are affected: `+pass/edit-entry`,
`+pass/copy-field`, `+pass/copy-secret`, `+pass/browse-url`. All of
these functions have counterparts in `password-store`. Additionally, the
functions in password store add git commit messages when files are
changed.

Questions:
- Should we also deprecate the `ivy` and `consult` versions? The
`password-store` versions work perfectly well here with `vertico` (not
sure about `ivy` though).
This commit is contained in:
Dominik Schrempf 2021-10-02 00:05:43 +02:00 • committed by Henrik Lissner
parent 7bf918f8c6
commit e6a4effdf6
2 changed files with 8 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

49
modules/tools/pass/autoload/pass.el
View file

@ -1,20 +1,5 @@
;;; tools/pass/autoload/pass.el -*- lexical-binding: t; -*-
(defun +pass--open-url (entry)
(if-let* ((url (+pass-get-field entry +pass-url-fields)))
(and (or (string-match-p "https?://" url)
(error "Field for %s doesn't look like an url" item))
(browse-url url))
(error "url not found.")))
(defun +pass--copy (entry field text)
(password-store-clear)
(message "Copied %s's %s field to clipboard. Will clear in %s seconds"
entry field (password-store-timeout))
(kill-new text)
(setq password-store-timeout-timer
(run-at-time (password-store-timeout) nil 'password-store-clear)))
(defun +pass--copy-username (entry)
(if-let* ((user (+pass-get-field entry +pass-user-fields)))
(progn (password-store-clear)
@ -22,11 +7,6 @@
(kill-new user))
(error "Username not found.")))
(defun +pass--completing-read-field (entry)
(let* ((data (+pass-get-entry entry))
(field (if data (completing-read "Field: " (mapcar #'car data) nil t))))
(+pass-get-field data field)))
;;
;; API
@ -67,29 +47,13 @@ search of your username. May prompt for your gpg passphrase."
;;;###autoload (autoload 'password-store--completing-read "password-store")
;;;###autoload
(defun +pass/edit-entry (entry)
"Interactively search for and open a pass entry for editing."
(interactive
(list (password-store--completing-read)))
(find-file (concat (expand-file-name entry (password-store-dir)) ".gpg")))
(define-obsolete-function-alias '+pass/edit-entry #'password-store-edit "21.12")
;;;###autoload
(defun +pass/copy-field (entry)
"Interactively search for an entry and copy a particular field to your
clipboard."
(interactive
(list (password-store--completing-read)))
(let* ((data (+pass-get-entry entry))
(field (if data (completing-read "Field: " (mapcar #'car data) nil t))))
(+pass--copy entry field (+pass-get-field data field))))
(define-obsolete-function-alias '+pass/copy-field #'password-store-copy-field "21.12")
;;;###autoload
(defun +pass/copy-secret (entry)
"Interactively search for an entry and copy its secret/password to your
clipboard."
(interactive
(list (password-store--completing-read)))
(+pass--copy entry 'secret (+pass-get-secret entry)))
(define-obsolete-function-alias '+pass/copy-secret #'password-store-copy "21.12")
;;;###autoload
(defun +pass/copy-user (entry)
@ -100,9 +64,4 @@ fields in `+pass-user-fields' is used to find the login field."
(+pass--copy-username entry))
;;;###autoload
(defun +pass/browse-url (entry)
"Interactively search for an entry and open its url in your browser. The
fields in `+pass-url-fields' is used to find the url field."
(interactive
(list (password-store--completing-read)))
(+pass--open-url entry))
(define-obsolete-function-alias '+pass/browse-url #'password-store-url "21.12")