Cadair
/
org-clock-waybar
forked from gergely/org-clock-waybar
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Make sure we clear the current task when clocking out or when killing Emacs

This commit is contained in:
Gergely Polonkai 2021-03-11 16:07:56 +01:00
parent 907998b3ff
commit 4a3c4b549e
No known key found for this signature in database
GPG Key ID: 2D2885533B869ED4
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org-clock-waybar.el
View File

@ -64,17 +64,20 @@
'emacs-mule) 'emacs-mule)
"Coding system of the file `org-clock-waybar-filename'.") "Coding system of the file `org-clock-waybar-filename'.")
(defun org-clock-waybar--get-clocked-task-json () (defun org-clock-waybar--get-clocked-task-json (&optional clocking-out)
"Get the currently clocked-in task’s data as a stringified JSON object. "Get the currently clocked-in task’s data as a stringified JSON object.
The output is in JSON format constructed in a way so Waybar can process it. 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 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'." value of `org-clock-waybar-not-clocked-in-text'.
(let ((category (when org-clock-current-task
(get-text-property 0 'org-category org-clock-current-task))) If CLOCKING-OUT is non-nil, `org-clock-current-task' will be treated as if it
(title (when org-clock-current-task were nil; this is required because `org-clock-out' calls the hook functions
(substring-no-properties org-clock-current-task))) before setting `org-clock-current-task' to nil."
(output (json-new-object))) (let* ((task (if clocking-out nil org-clock-current-task))
(category (when task (get-text-property 0 'org-category task)))
(title (when task (substring-no-properties task)))
(output (json-new-object)))
(setq output (json-add-to-object (setq output (json-add-to-object
output output
"text" "text"
@ -87,14 +90,20 @@ value of `org-clock-waybar-not-clocked-in-text'."
(setq output (json-add-to-object output "percentage" "")) (setq output (json-add-to-object output "percentage" ""))
(json-encode output))) (json-encode output)))
(defun org-clock-waybar-save-task () (defun org-clock-waybar-save-task (&optional clocking-out)
"Save the current clocked in task to `org-clock-waybar-filename'." "Save the current clocked in task to `org-clock-waybar-filename'.
If CLOCKING-OUT is non-nil, treat the current task as if it were nil."
(with-temp-buffer (with-temp-buffer
(erase-buffer) (erase-buffer)
(set-buffer-file-coding-system org-clock-waybar-filename-coding-system) (set-buffer-file-coding-system org-clock-waybar-filename-coding-system)
(insert (org-clock-waybar--get-clocked-task-json)) (insert (org-clock-waybar--get-clocked-task-json clocking-out))
(write-file org-clock-waybar-filename))) (write-file org-clock-waybar-filename)))
(defun org-clock-waybar-clear-task ()
"Clear the current task from `org-clock-waybar-filename'."
(org-clock-waybar-save-task t))
(defun org-clock-waybar-ouptut-task () (defun org-clock-waybar-ouptut-task ()
"Output the current task in JSON format Waybar can understand. "Output the current task in JSON format Waybar can understand.
@ -109,7 +118,8 @@ emacsclient --eval '(org-clock-waybar-output-task)'"
It adds `org-clock-waybar-save-task' to both `org-clock-in-hook' and It adds `org-clock-waybar-save-task' to both `org-clock-in-hook' and
`org-clock-out-hook'." `org-clock-out-hook'."
(add-hook 'org-clock-in-hook #'org-clock-waybar-save-task) (add-hook 'org-clock-in-hook #'org-clock-waybar-save-task)
(add-hook 'org-clock-out-hook #'org-clock-waybar-save-task)) (add-hook 'org-clock-out-hook #'org-clock-waybar-task)
(add-hook 'kill-emacs-hook #'org-clock-waybar-clear-task))
(provide 'org-clock-waybar) (provide 'org-clock-waybar)
;;; org-clock-waybar.el ends here ;;; org-clock-waybar.el ends here