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

Compare commits

merge into: gergely:configurable-output
Branches Tags
gergely:main
gergely:readme-redesign
gergely:remove-text-properties
gergely:configurable-output
...
pull from: gergely:main
Branches Tags
gergely:readme-redesign
gergely:main
gergely:remove-text-properties
gergely:configurable-output

5 Commits
configurab ... main

Author SHA1 Message Date
Gergely Polonkai
c327eb18c6
Make the xdg dependency optional 
We now default to using `~/.cache/waybar-current-task.json` if the `xdg` package is not present.
 2023-01-31 08:47:36 +01:00
Gergely Polonkai
754fd9d2fa Merge pull request '[Bugfix] Make sure we remove all text properties before outputting JSON data' (#8) from remove-text-properties into main 
Reviewed-on: #8
 2021-10-16 10:24:06 +00:00
Gergely Polonkai
a144ee13c0
[Bugfix] Make sure we remove all text properties before outputting JSON data 2021-10-16 06:25:34 +02:00
Stuart Mumford
612c0d1e31
Do not use org-clock-goto to get tags 2021-03-29 10:20:01 +01:00
lh@hrdl.eu
3e71766f85
Add-hook org-clock-cancel-hook 2021-03-13 16:01:43 +01:00
1 changed files with 13 additions and 6 deletions
Show Stats Expand all files Collapse all files

19
org-clock-waybar.el
View File

@ -38,7 +38,7 @@
;;; Code: ;;; Code:
(require 'xdg) (require 'xdg nil t)
(require 'json) (require 'json)
(require 'org-clock) (require 'org-clock)
@ -47,7 +47,9 @@
:group 'emacs) :group 'emacs)
(defcustom org-clock-waybar-filename (defcustom org-clock-waybar-filename
(expand-file-name "waybar-current-task.json" (xdg-cache-home)) (if (fboundp 'xdg-cache-home)
(expand-file-name "waybar-current-task.json" (xdg-cache-home))
(expand-file-name "~/.cache/waybar-current-task.json"))
"Name of the file to save task data to." "Name of the file to save task data to."
:type 'string :type 'string
:group 'org-clock-waybar) :group 'org-clock-waybar)
@ -84,9 +86,9 @@
(defun org-clock-waybar--get-tags () (defun org-clock-waybar--get-tags ()
"Get the tags of the currently clocked-in task." "Get the tags of the currently clocked-in task."
(when (org-clocking-p) (when (org-clocking-p)
(save-window-excursion (or (org-with-point-at org-clock-marker (org-get-tags))
(org-clock-goto) "")
(org-get-tags)))) ))
(defun org-clock-waybar--get-clocked-task-json () (defun org-clock-waybar--get-clocked-task-json ()
"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.
@ -122,13 +124,18 @@ value of `org-clock-waybar-not-clocked-in-text'."
This function is ought to be used via Emacsclient: This function is ought to be used via Emacsclient:
emacsclient --eval '(org-clock-waybar-output-task)'" emacsclient --eval '(org-clock-waybar-output-task)'"
(org-clock-waybar--get-clocked-task-json)) (let* ((output (org-clock-waybar--get-clocked-task-json))
(start 0)
(end (length output)))
(set-text-properties start end nil output)
output))
(defun org-clock-waybar-setup () (defun org-clock-waybar-setup ()
"Setup org-clock-waybar. "Setup org-clock-waybar.
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-cancel-hook #'org-clock-waybar-save-task)
(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-save-task)
(add-hook 'kill-emacs-hook #'org-clock-waybar-save-task)) (add-hook 'kill-emacs-hook #'org-clock-waybar-save-task))