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

WIP: taxy-org-ql-report, etc

Browse source
This commit is contained in:
Adam Porter 2023-02-21 18:04:48 -06:00
parent d242d9c41f
commit 194491f57e
1 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

45
taxy-org-ql-view.el
View file

@ -462,7 +462,7 @@ that order."
"Format table for all items in view.") "Format table for all items in view.")
(cl-defun taxy-org-ql-view (cl-defun taxy-org-ql-view
(&rest rest &key name buffer queries from group sort append columns) (&rest rest &key name buffer queries from where group sort append columns)
"Show Org QL QUERIES in BUFFER with `taxy-org-ql-view'. "Show Org QL QUERIES in BUFFER with `taxy-org-ql-view'.
BUFFER may be a buffer, a name of a buffer, or a name of a buffer BUFFER may be a buffer, a name of a buffer, or a name of a buffer
to make. to make.
@ -540,41 +540,40 @@ contents."
(cl-pushnew rest taxy-org-ql-view-args :test #'equal) (cl-pushnew rest taxy-org-ql-view-args :test #'equal)
(when columns (when columns
(setq-local org-ql-view-columns columns)) (setq-local org-ql-view-columns columns))
(pcase-dolist ((map (:name this-name) (:from this-from) (pcase-dolist ((map (:name query-name) (:from query-from)
(:group this-group) (:sort this-sort) (:where query-where)
(:group query-group) (:sort query-sort)
:query) :query)
queries) queries)
(setf this-name (or this-name name) (setf query-name (or query-name name)
this-from (or this-from from) query-from (or query-from from)
this-group (or this-group group) query-where (or query-where where)
;; FIXME: This binding is ugly, but it seems necessary query-group (or query-group group)
;; FIXME: Query binding is ugly, but it seems necessary
;; due to the way the `make-fn' closes over the ;; due to the way the `make-fn' closes over the
;; argument passed to `taxy-make-take-function' ;; argument passed to `taxy-make-take-function'
;; (passing it as an argument to `make-fn' does not ;; (passing it as an argument to `make-fn' does not
;; work). ;; work).
make-fn-group (or this-group group) make-fn-group (or query-group group)
this-sort (or this-sort sort)) query-sort (or query-sort sort))
(let* ((title (or this-name (let* ((title (or query-name
(org-ql-view--header-line-format (org-ql-view--header-line-format
:buffers-files from :buffers-files from
:query query :query query)))
;; FIXME: View titles. (items (org-ql-query :from query-from :where query-where
))) :order-by query-sort))
(items (org-ql-select from query
:action 'element-with-markers
:sort sort))
(taxy (thread-last (make-fn :name title) (taxy (thread-last (make-fn :name title)
(taxy-fill items)))) (taxy-fill items))))
(push taxy (taxy-taxys instance-taxy)))) (push taxy (taxy-taxys instance-taxy))))
(setf (taxy-taxys instance-taxy) (nreverse (taxy-taxys instance-taxy)) (setf (taxy-taxys instance-taxy) (nreverse (taxy-taxys instance-taxy))
(taxy-taxys taxy-org-ql-view-taxy) (append (taxy-taxys taxy-org-ql-view-taxy) (list instance-taxy))) (taxy-taxys taxy-org-ql-view-taxy) (append (taxy-taxys taxy-org-ql-view-taxy)
(list instance-taxy)))
(let ((inhibit-read-only t) (let ((inhibit-read-only t)
(taxy-magit-section-insert-indent-items nil)) (taxy-magit-section-insert-indent-items nil))
(erase-buffer) (erase-buffer)
(setf format-cons (taxy-org-ql-view-magit-section-format-items (setf format-cons (taxy-org-ql-view-magit-section-format-items
org-ql-view-columns org-ql-view-column-formatters taxy-org-ql-view-taxy org-ql-view-columns org-ql-view-column-formatters taxy-org-ql-view-taxy
:table taxy-org-ql-view-format-table) :table taxy-org-ql-view-format-table)
;; taxy-org-ql-view-format-table (car format-cons)
column-sizes (cdr format-cons) column-sizes (cdr format-cons)
header-line-format (taxy-magit-section-format-header header-line-format (taxy-magit-section-format-header
column-sizes org-ql-view-column-formatters)) column-sizes org-ql-view-column-formatters))
@ -585,18 +584,20 @@ contents."
(goto-char (point-min))) (goto-char (point-min)))
(pop-to-buffer (current-buffer)))))) (pop-to-buffer (current-buffer))))))
(cl-defun taxy-org-ql-view-multi (cl-defun taxy-org-ql-report
(&key buffer from sort group columns sections (&key buffer queries from where sort group columns sections
&aux append) &aux append)
(declare (indent defun)) (declare (indent defun))
(pcase-dolist ((map (:name section-name) (:from section-from) (pcase-dolist ((map (:name section-name) (:from section-from)
(:where section-where)
(:sort section-sort) (:group section-group) (:sort section-sort) (:group section-group)
:queries) (:queries section-queries))
sections) sections)
(taxy-org-ql-view :buffer buffer :columns columns (taxy-org-ql-view :buffer buffer :columns columns
:name (or section-name name) :from (or section-from from) :name (or section-name name) :from (or section-from from)
:where (or section-where where)
:sort (or section-sort sort) :group (or section-group group) :sort (or section-sort sort) :group (or section-group group)
:queries queries :append append) :queries (or section-queries queries) :append append)
(setf append t))) (setf append t)))
(defun taxy-org-ql-view-refresh () (defun taxy-org-ql-view-refresh ()