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

Add: org-ql-view--format-query

Browse source 
Used to e.g. make timestamp objects in query human readable for
display in view headers.
This commit is contained in:
Adam Porter 2019-12-29 17:37:15 -06:00
parent 091a732a88
commit c238ebcc97
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
org-ql-view.el
View file

@ -43,6 +43,7 @@
(require 's) (require 's)
(require 'org-super-agenda) (require 'org-super-agenda)
(require 'ov) (require 'ov)
(require 'ts)
;;;; Compatibility ;;;; Compatibility
@ -389,10 +390,10 @@ subsequent refreshing of the buffer: `org-ql-view-buffers-files',
(concat (propertize "View:" 'face 'org-agenda-structure) (concat (propertize "View:" 'face 'org-agenda-structure)
title " ") title " ")
"")) ""))
(query-formatted (format "%S" query)) (query-formatted (org-ql-view--format-query query))
(query-formatted (propertize (org-ql-view--font-lock-string 'emacs-lisp-mode query-formatted)
'help-echo query-formatted))
(query-width (length query-formatted)) (query-width (length query-formatted))
(query-propertized (propertize (org-ql-view--font-lock-string 'emacs-lisp-mode query-formatted)
'help-echo query-formatted))
(available-width (max 0 (- (window-width) (available-width (max 0 (- (window-width)
(length "In: ") (length "In: ")
(length "Query: ") (length "Query: ")
@ -404,10 +405,22 @@ subsequent refreshing of the buffer: `org-ql-view-buffers-files',
'help-echo buffers-files-formatted))) 'help-echo buffers-files-formatted)))
(concat title (concat title
(propertize "Query:" 'face 'org-agenda-structure) (propertize "Query:" 'face 'org-agenda-structure)
query-formatted " " query-propertized " "
(propertize "In:" 'face 'org-agenda-structure) (propertize "In:" 'face 'org-agenda-structure)
buffers-files-formatted))) buffers-files-formatted)))
(defun org-ql-view--format-query (query)
"Return QUERY formatted as a string.
Makes QUERY more readable, e.g. timestamp objects are replaced
with human-readable strings."
(cl-labels ((rec (form)
(cl-typecase form
(ts (ts-format form))
(cons (cons (rec (car form))
(rec (cdr form))))
(otherwise form))))
(format "%S" (rec query))))
(defun org-ql-view--font-lock-string (mode s) (defun org-ql-view--font-lock-string (mode s)
"Return string S font-locked according to MODE." "Return string S font-locked according to MODE."
;; FIXME: Is this the proper way to do this? It works, but I feel like there must be a built-in way... ;; FIXME: Is this the proper way to do this? It works, but I feel like there must be a built-in way...