From 2d820dbf871438f871a129fd65e99007ca44f96d Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Fri, 12 Mar 2021 13:52:27 +0100 Subject: [PATCH] Rename most functions to remove the double dashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This naming convention denotes “private” functions; however, if we want to introduce more customization, we should make these available and documented well. --- org-clock-waybar.el | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/org-clock-waybar.el b/org-clock-waybar.el index 766b130..3ad7910 100644 --- a/org-clock-waybar.el +++ b/org-clock-waybar.el @@ -64,24 +64,24 @@ 'emacs-mule) "Coding system of the file `org-clock-waybar-filename'.") -(defsubst org-clock-waybar--get-task-title () +(defsubst org-clock-waybar-get-task-title () "Get the title of TASK." (when (org-clocking-p) (substring-no-properties org-clock-current-task))) -(defsubst org-clock-waybar--get-task-category () +(defsubst org-clock-waybar-get-task-category () "Get the category of TASK." (when (org-clocking-p) (get-text-property 0 'org-category org-clock-current-task))) -(defun org-clock-waybar--get-tooltip () +(defun org-clock-waybar-get-tooltip () "The default tooltip to send to waybar." (when (org-clocking-p) (let ((clocked-time (org-clock-get-clocked-time))) (format "%s: %s (%s)" - (org-clock-waybar--get-task-category) - (org-clock-waybar--get-task-title) + (org-clock-waybar-get-task-category) + (org-clock-waybar-get-task-title) (org-duration-from-minutes clocked-time))))) -(defun org-clock-waybar--get-tags () +(defun org-clock-waybar-get-tags () "Get the tags of the currently clocked-in task." (when (org-clocking-p) (save-window-excursion @@ -94,9 +94,10 @@ The output is in JSON format constructed in a way so Waybar can process it. If there is no clocked in task, alt becomes empty and text will be set to the value of `org-clock-waybar-not-clocked-in-text'." - (let* ((category (org-clock-waybar--get-task-category)) - (title (org-clock-waybar--get-task-title)) - (tooltip (org-clock-waybar--get-tooltip)) + (let* ((title (org-clock-waybar-get-task-title)) + (category (org-clock-waybar-get-task-category)) + (tooltip (org-clock-waybar-get-tooltip)) + (class (org-clock-waybar-get-tags)) (output (json-new-object))) (setq output (json-add-to-object output @@ -104,7 +105,7 @@ value of `org-clock-waybar-not-clocked-in-text'." (or title org-clock-waybar-not-clocked-in-text))) (setq output (json-add-to-object output "alt" (or category ""))) (setq output (json-add-to-object output "tooltip" (or tooltip ""))) - (setq output (json-add-to-object output "class" (or (org-clock-waybar--get-tags) ""))) + (setq output (json-add-to-object output "class" (or class ""))) (setq output (json-add-to-object output "percentage" "")) (json-encode output)))