contrapunctus
/
chronometrist
Archived
1
3
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Adapt sexp-events-populate to to-hash-table

This commit is contained in:
contrapunctus 2021-09-04 20:20:59 +05:30
parent 78048824e5
commit 083a2f4d8e
2 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
elisp/chronometrist.el
View File

@ -411,7 +411,8 @@ Value must be a keyword corresponding to a key in
"Return number of records in BACKEND.") "Return number of records in BACKEND.")
(cl-defgeneric chronometrist-to-hash-table (backend) (cl-defgeneric chronometrist-to-hash-table (backend)
"Return data in BACKEND as a hash table.") "Return data in BACKEND as a hash table in chronological order.
Hash table keys are ISO-8601 date strings. Hash table values are lists of records, represented by plists. Both hash table keys and hash table values must be in chronological order.")
(cl-defgeneric chronometrist-from-hash-table (backend hash-table) (cl-defgeneric chronometrist-from-hash-table (backend hash-table)
"Save data from HASH-TABLE to BACKEND.") "Save data from HASH-TABLE to BACKEND.")
@ -489,15 +490,11 @@ EXPR is bound to each s-expression."
(plist-get last-event :name)))) (plist-get last-event :name))))
(defvar chronometrist-events) (defvar chronometrist-events)
(defun chronometrist-sexp-events-populate () (cl-defmethod chronometrist-to-hash-table ((backend chronometrist-plist-backend))
"Populate hash table `chronometrist-events'. (chronometrist-sexp-in-file (chronometrist-backend-file backend)
The data is acquired from `chronometrist-file'.
Return final number of events read from file, or nil if there
were none."
(chronometrist-sexp-in-file (chronometrist-backend-file (chronometrist-active-backend))
(goto-char (point-min)) (goto-char (point-min))
(let ((index 0) expr pending-expr) (let ((table chronometrist-events)
expr pending-expr)
(while (or pending-expr (while (or pending-expr
(setq expr (ignore-errors (read (current-buffer))))) (setq expr (ignore-errors (read (current-buffer)))))
;; find and split midnight-spanning events during deserialization itself ;; find and split midnight-spanning events during deserialization itself
@ -511,15 +508,14 @@ were none."
(t expr))) (t expr)))
(new-value-date (--> (plist-get new-value :start) (new-value-date (--> (plist-get new-value :start)
(substring it 0 10))) (substring it 0 10)))
(existing-value (gethash new-value-date chronometrist-events))) (existing-value (gethash new-value-date table)))
(unless pending-expr (cl-incf index))
(puthash new-value-date (puthash new-value-date
(if existing-value (if existing-value
(append existing-value (append existing-value
(list new-value)) (list new-value))
(list new-value)) (list new-value))
chronometrist-events))) table)))
(unless (zerop index) index)))) table)))
(cl-defmethod chronometrist-create-file ((backend chronometrist-plist-backend)) (cl-defmethod chronometrist-create-file ((backend chronometrist-plist-backend))
(let ((file (chronometrist-backend-file backend))) (let ((file (chronometrist-backend-file backend)))
@ -817,7 +813,7 @@ The data is acquired from `chronometrist-file'.
Return final number of events read from file, or nil if there Return final number of events read from file, or nil if there
were none." were none."
(clrhash chronometrist-events) (clrhash chronometrist-events)
(chronometrist-sexp-events-populate)) (chronometrist-to-hash-table (chronometrist-active-backend)))
(defun chronometrist-events-update (plist &optional replace) (defun chronometrist-events-update (plist &optional replace)
"Add PLIST to the end of `chronometrist-events'. "Add PLIST to the end of `chronometrist-events'.

26
elisp/chronometrist.org
View File

@ -1020,7 +1020,8 @@ Value must be a keyword corresponding to a key in
**** to-hash-table :generic:function: **** to-hash-table :generic:function:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(cl-defgeneric chronometrist-to-hash-table (backend) (cl-defgeneric chronometrist-to-hash-table (backend)
"Return data in BACKEND as a hash table.") "Return data in BACKEND as a hash table in chronological order.
Hash table keys are ISO-8601 date strings. Hash table values are lists of records, represented by plists. Both hash table keys and hash table values must be in chronological order.")
#+END_SRC #+END_SRC
**** from-hash-table :generic:function: **** from-hash-table :generic:function:
@ -1220,18 +1221,14 @@ EXPR is bound to each s-expression."
nil nil
(plist-get last-event :name)))) (plist-get last-event :name))))
#+END_SRC #+END_SRC
**** events-populate :writer: **** to-hash-table :writer:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(defvar chronometrist-events) (defvar chronometrist-events)
(defun chronometrist-sexp-events-populate () (cl-defmethod chronometrist-to-hash-table ((backend chronometrist-plist-backend))
"Populate hash table `chronometrist-events'. (chronometrist-sexp-in-file (chronometrist-backend-file backend)
The data is acquired from `chronometrist-file'.
Return final number of events read from file, or nil if there
were none."
(chronometrist-sexp-in-file (chronometrist-backend-file (chronometrist-active-backend))
(goto-char (point-min)) (goto-char (point-min))
(let ((index 0) expr pending-expr) (let ((table chronometrist-events)
expr pending-expr)
(while (or pending-expr (while (or pending-expr
(setq expr (ignore-errors (read (current-buffer))))) (setq expr (ignore-errors (read (current-buffer)))))
;; find and split midnight-spanning events during deserialization itself ;; find and split midnight-spanning events during deserialization itself
@ -1245,15 +1242,14 @@ were none."
(t expr))) (t expr)))
(new-value-date (--> (plist-get new-value :start) (new-value-date (--> (plist-get new-value :start)
(substring it 0 10))) (substring it 0 10)))
(existing-value (gethash new-value-date chronometrist-events))) (existing-value (gethash new-value-date table)))
(unless pending-expr (cl-incf index))
(puthash new-value-date (puthash new-value-date
(if existing-value (if existing-value
(append existing-value (append existing-value
(list new-value)) (list new-value))
(list new-value)) (list new-value))
chronometrist-events))) table)))
(unless (zerop index) index)))) table)))
#+END_SRC #+END_SRC
**** create-file :writer:method: **** create-file :writer:method:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
@ -1749,7 +1745,7 @@ The data is acquired from `chronometrist-file'.
Return final number of events read from file, or nil if there Return final number of events read from file, or nil if there
were none." were none."
(clrhash chronometrist-events) (clrhash chronometrist-events)
(chronometrist-sexp-events-populate)) (chronometrist-to-hash-table (chronometrist-active-backend)))
#+END_SRC #+END_SRC
*** events-update :writer: *** events-update :writer:
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp