+pass/ivy: fix open-url; add +pass-get-field (#103)

modules/tools/password-store/autoload.el

@@ -11,8 +11,23 @@
          (pass))))
 
 
-(after! ivy
+;;;###autoload
-  (defun +pass-ivy-action--get-field (item)
+(defun +pass-get-field (entry fields)
+  (if-let (data (if (listp entry) entry (auth-pass-parse-entry entry)))
+      (cl-loop for key in (doom-enlist fields)
+               when (assoc key data)
+               return (cdr it))
+    (error "Couldn't find entry: %s" entry)))
+
+(defun +pass-ivy-action--open-url (entry)
+  (if-let (url (+pass-get-field entry +pass-url-fields))
+      (and (or (string-prefix-p "http://" url)
+               (string-prefix-p "https://" url)
+               (error "Field for %s doesn't look like an url" item))
+           (browse-url url))
+    (error "Username not found.")))
+
+(defun +pass-ivy-action--get-field (item)
   (let* ((data (auth-pass-parse-entry item))
           (field (if data (completing-read "Field: " (mapcar #'car data) nil t))))
     (if data
@@ -20,27 +35,25 @@
           (password-store-clear)
           (message "Copied %s's %s field to clipboard. Will clear in %s seconds"
                     item field (password-store-timeout))
-            (kill-new (cdr (assoc field data)))
+          (kill-new (+pass-get-field data field))
           (setq password-store-timeout-timer
                 (run-at-time (password-store-timeout) nil 'password-store-clear)))
       (error "Couldn't find entry: %s" item))))
 
-  (defun +pass-ivy-action--copy-username (item)
+(defun +pass-ivy-action--copy-username (entry)
-    (if-let (user (cl-loop with data = (auth-pass-parse-entry item)
+  (if-let (user (+pass-get-field entry +pass-user-fields))
-                           for key in +pass-user-fields
-                           when (assoc key data)
-                           return (cdr it)))
       (progn (password-store-clear)
              (message "Copied username to the kill ring.")
              (kill-new user))
-      (message "Username not found!")))
+    (error "Username not found.")))
 
+(after! ivy
   (ivy-add-actions
    '+pass/ivy
    '(("o" password-store-copy "copy password")
-     ("u" +pass-ivy-action--copy-username "copy username")
      ("e" password-store-edit "edit entry")
-     ("b" password-store-url "open url in browser")
+     ("u" +pass-ivy-action--copy-username "copy username")
+     ("b" +pass-ivy-action--open-url "open url in browser")
      ("f" +pass-ivy-action--get-field "get field"))))
 
 ;;;###autoload

modules/tools/password-store/config.el

@@ -3,6 +3,9 @@
 (defvar +pass-user-fields '("login" "user" "username" "email")
   "A list of fields for `+pass/ivy' to search for the username.")
 
+(defvar +pass-url-fields '("url" "site" "location")
+  "A list of fields for `+pass/ivy' to search for the username.")
+
 
 ;;
 ;; Plugins