Skip to content

Add filename to parsed clock entry list & provide a message when file exists assertion fails #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add filename to parsed clock entry list & provide a message when file exists assertion fails #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d52ea47
Makefile: allow one set specify emacs' path
sshaw May 28, 2019
7e3ced4
Add filename to parsed clock entry list [fixes #19]
sshaw Jun 1, 2019
24f0307
Provide a message when file exists assertion fails [fixes #18]
sshaw Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
emacs ?= emacs

test: org-clock-csv-tests.el
emacs -batch -f package-initialize -l ert -L . -l $< -f ert-run-tests-batch-and-exit
"$(emacs)" -batch -f package-initialize -l ert -L . -l $< -f ert-run-tests-batch-and-exit

.PHONY: test
13 changes: 8 additions & 5 deletions org-clock-csv.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,14 @@ When NO-CHECK is non-nil, skip checking if all files exist."
(when (not no-check)
;; For the sake of better debug messages, check whether all of the
;; files exists first.
(mapc (lambda (file) (cl-assert (file-exists-p file))) filelist))
(cl-loop for file in filelist append
(with-current-buffer (find-file-noselect file)
(org-element-map (org-element-parse-buffer) 'clock
#'org-clock-csv--parse-element nil nil))))
(mapc (lambda (file)
(cl-assert (file-exists-p file) nil "File does not exist: %s" file)) filelist))
(cl-loop for file in filelist
for entry = (with-current-buffer (find-file-noselect file)
(org-element-map (org-element-parse-buffer) 'clock
#'org-clock-csv--parse-element nil nil))
do (plist-put (car entry) :filename file)
append entry))

;;;; Public API:

Expand Down