jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

store links with multiple files or buffers

Browse source
This commit is contained in:
Trey Peacock 2020-11-10 09:29:06 -07:00
parent c457adf2d9
commit 99db7e5259
No known key found for this signature in database
GPG key ID: 21E35BB0B36D1094
1 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
org-ql-view.el
View file

@ -599,8 +599,10 @@ protocol. See, e.g. `org-ql-view--link-store'."
(groups (--when-let (alist-get "super-groups" params nil nil #'string=) (groups (--when-let (alist-get "super-groups" params nil nil #'string=)
(read it))) (read it)))
(title (--when-let (alist-get "title" params nil nil #'string=) (title (--when-let (alist-get "title" params nil nil #'string=)
(read it)))
(files (--when-let (alist-get "files" params nil nil #'string=)
(read it)))) (read it))))
(org-ql-search (current-buffer) query (org-ql-search files query
:sort sort :sort sort
:super-groups groups :super-groups groups
:title title))) :title title)))
@ -610,16 +612,28 @@ protocol. See, e.g. `org-ql-view--link-store'."
When opened, the link searches the buffer it's opened from." When opened, the link searches the buffer it's opened from."
(require 'url-parse) (require 'url-parse)
(require 'url-util) (require 'url-util)
(unless (or (bufferp org-ql-view-buffers-files)
(= 1 (length org-ql-view-buffers-files)))
(user-error "Only views searching a single buffer may be linked"))
(when org-ql-view-query (when org-ql-view-query
(let* ((params (list (when org-ql-view-super-groups (cl-labels ((file-nameize
(b-f) (or (when (stringp b-f) b-f)
(buffer-file-name b-f)
(when (buffer-base-buffer b-f)
(buffer-file-name (buffer-base-buffer b-f)))
(user-error "Only file-backed buffers can be bookmarked by Org QL View: %s" b-f))))
(let* ((buffers-files org-ql-view-buffers-files)
(files (cl-etypecase buffers-files
(function (funcall buffers-files))
(string buffers-files)
(buffer (file-nameize buffers-files))
(list (cl-loop for b-f in buffers-files
collect (file-nameize b-f)))))
(params (list (when org-ql-view-super-groups
(list "super-groups" (prin1-to-string org-ql-view-super-groups))) (list "super-groups" (prin1-to-string org-ql-view-super-groups)))
(when org-ql-view-sort (when org-ql-view-sort
(list "sort" (prin1-to-string org-ql-view-sort))) (list "sort" (prin1-to-string org-ql-view-sort)))
(when org-ql-view-title (when org-ql-view-title
(list "title" (prin1-to-string org-ql-view-title))))) (list "title" (prin1-to-string org-ql-view-title)))
(when org-ql-view-buffers-files
(list "files" (prin1-to-string files)))))
(filename (concat (url-hexify-string (org-ql-view--format-query org-ql-view-query)) (filename (concat (url-hexify-string (org-ql-view--format-query org-ql-view-query))
"?" (url-build-query-string (delete nil params)))) "?" (url-build-query-string (delete nil params))))
(url (url-recreate-url (url-parse-make-urlobj "org-ql-search" nil nil nil nil (url (url-recreate-url (url-parse-make-urlobj "org-ql-search" nil nil nil nil
@ -627,7 +641,7 @@ When opened, the link searches the buffer it's opened from."
(org-store-link-props (org-store-link-props
:type "org-ql-search" :type "org-ql-search"
:link url :link url
:description (concat "org-ql-search: " org-ql-view-title))) :description (concat "org-ql-search: " org-ql-view-title))))
t)) t))
;;;; Transient ;;;; Transient