sqrtminusone/org-journal-tags
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/org-journal-tags.git synced 2025-12-10 10:53:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from SqrtMinusOne/feature/tags-refactor

Browse source 
Add tags refactoring
This commit is contained in:
Pavel Korytov 2022-04-16 18:07:31 +03:00 • committed by GitHub
commit ca6327161f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 99 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.org
View file

@ -43,6 +43,8 @@ The link will reference the current Org Mode paragraph. If you want to reference
Run =M-x org-journal-tags-link-get-region-at-point= to select the referenced region of the buffer.
To add a tag to the entire section, run =M-x org-journal-tags-prop-set=, which will create or update the =Tags= property in the property drawer of the current time section. This command features a notmuch-like UI, i.e. completing read for multiple entries, where =+<tag>= adds a tag and =-<tag>= deletes a tag.
If you decide to rename a tag, there's =M-x org-journal-tags-refactor=.
** Adding timestamps
In addition to tags, the package also aggregates inline timestamps, i.e. timestamps that are left in the text like this:

99
org-journal-tags.el
View file

@ -4,7 +4,7 @@
;; Author: Korytov Pavel <thexcloud@gmail.com>
;; Maintainer: Korytov Pavel <thexcloud@gmail.com>
;; Version: 0.2.0
;; Version: 0.3.0
;; Package-Requires: ((emacs "27.1") (org-journal "2.1.2") (magit-section "3.3.0") (transient "0.3.7"))
;; Homepage: https://github.com/SqrtMinusOne/org-journal-tags
@ -331,7 +331,7 @@ The properties are:
(with-temp-buffer
(insert-file-contents org-journal-tags-db-file)
(goto-char (point-min))
(condition-case err
(condition-case _
(progn
(setf org-journal-tags-db (read (current-buffer)))
(org-journal-tags-db--migrate))
@ -1550,6 +1550,98 @@ the rest are date numbers. Such a list is constructed by
(alist-get :refs (cdr b)))))))))
result)))
;; Refactoring
(defun org-journal-tags--refactor-buffer-inline (source-tag-name target-tag-name)
"Rename SOURCE-TAG-NAME to TARGET-TAG-NAME in the buffer.
This function targets only inline links."
(save-excursion
(mapc
(lambda (link)
(let (case-fold-search
(start (org-element-property :begin link))
(end (org-element-property :end link)))
(goto-char end)
(while (search-backward source-tag-name start t)
(delete-region (match-beginning 0) (match-end 0))
(insert target-tag-name))))
(seq-reverse
(org-element-map (org-element-parse-buffer) 'link
(lambda (link)
(when (and (string= (org-element-property :type link) "org-journal")
(string= source-tag-name
(org-journal-tags--links-get-tag link)))
link)))))))
(defun org-journal-tags--refactor-buffer-section (source-tag-name target-tag-name)
"Rename SOURCE-TAG-NAME to TARGET-TAG-NAME in the buffer.
This function targets only section-wide links."
(save-excursion
(mapcar
(lambda (elem)
(let (case-fold-search
(start (org-element-property :begin elem))
(end (org-element-property :end elem)))
(goto-char end)
(while (search-backward source-tag-name start t)
(delete-region (match-beginning 0) (match-end 0))
(insert target-tag-name))))
(seq-reverse
(org-element-map (org-element-parse-buffer) 'property-drawer
(lambda (elem)
(let ((headline (org-journal-tags--get-element-parent elem 'headline)))
(when (and (= (org-element-property :level headline) 2)
(org-element-property :TAGS headline))
elem))))))))
(defun org-journal-tags-refactor (source-tag-name target-tag-name)
"Rename SOURCE-TAG-NAME to TARGET-TAG-NAME.
If called interactively, prompt for both."
(interactive
(progn
(org-journal-tags-db-ensure)
(let ((source-tag (completing-read
"Source tag: "
(org-journal-tags--list-tags)))
(target-tag
(read-from-minibuffer "Target tag: ")))
(unless (org-journal-tags--valid-tag-p target-tag)
(user-error "Invalid target tag name: %s" target-tag))
(unless (member source-tag (org-journal-tags--list-tags))
(user-error "Source tag name does not exist: %s" source-tag))
(when (member target-tag (org-journal-tags--list-tags))
(unless (y-or-n-p (format "This will merge %s with %s. Continue? "
source-tag target-tag))
(user-error "Aborted")))
(list source-tag target-tag))))
(let ((file-names
(thread-last
(alist-get :tags org-journal-tags-db)
(gethash source-tag-name)
(org-journal-tag-dates)
(funcall (lambda (hash)
(cl-loop for date being the hash-keys of hash
collect (org-journal--get-entry-path
(seconds-to-time date)))))
(seq-uniq))))
(cl-loop for file in file-names
for i from 0
do (with-temp-buffer
(message "Processing %d of %d" i (length file-names))
(insert-file-contents file)
(setq-local buffer-file-name file)
(let ((org-mode-hook nil))
(org-mode))
(org-journal-tags--ensure-decrypted)
(org-journal-tags--refactor-buffer-inline
source-tag-name target-tag-name)
(org-journal-tags--refactor-buffer-section
source-tag-name target-tag-name)
(save-buffer)))))
;; Status buffer
(defmacro org-journal-tags--with-close-status (&rest body)
@ -1572,6 +1664,7 @@ BODY is put in that lambda."
(define-key map (kbd "o") (org-journal-tags--with-close-status
(org-journal-open-current-journal-file)))
(define-key map (kbd "?") #'org-journal-tags--status-transient-help)
(define-key map (kbd "r") #'org-journal-tags-refactor)
(define-key map (kbd "RET") #'widget-button-press)
(define-key map (kbd "q") (lambda ()
(interactive)
@ -1586,6 +1679,7 @@ BODY is put in that lambda."
"o" (org-journal-tags--with-close-status
(org-journal-open-current-journal-file))
"?" #'org-journal-tags--status-transient-help
"r" #'org-journal-tags-refactor
"q" (lambda ()
(interactive)
(quit-window t))))
@ -1600,6 +1694,7 @@ BODY is put in that lambda."
("M-2" "Show level 2" magit-section-show-level-2-all)]
["Org Journal"
("s" "New query" org-journal-tags-transient-query)
("r" "Rename tag" org-journal-tags-refactor)
("n" "New journal entry" (lambda nil
(interactive)
(when (eq major-mode 'org-journal-tags-status-mode)