branch: externals/org
commit 75a13616161811850fd21b7e6bd8644f5e0b9d5f
Author: Slawomir Grochowski <[email protected]>
Commit: Slawomir Grochowski <[email protected]>
; org-colview: Extract summary type lookup
* lisp/org-colview.el (org-columns--summary-type): New function.
(org-columns--summarize, org-columns--collect): Use it.
Refactoring: Extract Function.
No behavior change.
---
lisp/org-colview.el | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 1b41bb777b..c4c4fe7447 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1379,11 +1379,15 @@ Return the result as a duration."
(apply fun (mapcar #'org-duration-to-minutes times))
(org-duration-h:mm-only-p times)))
+(defun org-columns--summary-type (operator)
+ "Return summary type definition for OPERATOR."
+ (or (assoc operator org-columns-summary-types)
+ (assoc operator org-columns-summary-types-default)
+ (error "Unknown %S operator" operator)))
+
(defun org-columns--summarize (operator)
"Return summary function associated to string OPERATOR."
- (pcase (or (assoc operator org-columns-summary-types)
- (assoc operator org-columns-summary-types-default))
- (`nil (error "Unknown %S operator" operator))
+ (pcase (org-columns--summary-type operator)
(`(,_ . ,(and (pred functionp) summarize)) summarize)
(`(,_ ,summarize ,_) summarize)
(_ (error "Invalid definition for operator %S" operator))))
@@ -1391,9 +1395,7 @@ Return the result as a duration."
(defun org-columns--collect (operator)
"Return collect function associated to string OPERATOR.
Return nil if no collect function is associated to OPERATOR."
- (pcase (or (assoc operator org-columns-summary-types)
- (assoc operator org-columns-summary-types-default))
- (`nil (error "Unknown %S operator" operator))
+ (pcase (org-columns--summary-type operator)
(`(,_ . ,(pred functionp)) nil) ;default value
(`(,_ ,_ ,collect) collect)
(_ (error "Invalid definition for operator %S" operator))))
