diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/org-capture-config.el | 13 | ||||
| -rw-r--r-- | modules/org-drill-config.el | 15 |
2 files changed, 17 insertions, 11 deletions
diff --git a/modules/org-capture-config.el b/modules/org-capture-config.el index 5cd76f0a..39cafe03 100644 --- a/modules/org-capture-config.el +++ b/modules/org-capture-config.el @@ -18,6 +18,7 @@ (defvar org-capture-templates) (defvar org-complex-heading-regexp-format) +(declare-function cj/--drill-pick-file "org-drill-config") (declare-function org-at-encrypted-entry-p "org-crypt") (declare-function org-at-heading-p "org") (declare-function org-back-to-heading "org") @@ -230,21 +231,13 @@ Captured On: %U" :prepend t) ("d" "Drill Question" entry - (file (lambda () - (let ((files (directory-files drill-dir nil "^[^.].*\\.org$"))) - (expand-file-name - (completing-read "Choose file: " files) - drill-dir)))) + (file (lambda () (cj/--drill-pick-file drill-dir))) "* Item :drill:\n%? ** Answer\n%i\nSource: [[%:link][%:description]] Captured On: %U" :prepend t) ("f" "Drill Question (from PDF)" entry - (file (lambda () - (let ((files (directory-files drill-dir nil "^[^.].*\\.org$"))) - (expand-file-name - (completing-read "Choose file: " files) - drill-dir)))) + (file (lambda () (cj/--drill-pick-file drill-dir))) "* Item :drill:\n%? ** Answer\n%(cj/org-capture-pdf-active-region) Source: [[%L][%(buffer-name (org-capture-get :original-buffer))]] diff --git a/modules/org-drill-config.el b/modules/org-drill-config.el index 79fdb027..c3852ed1 100644 --- a/modules/org-drill-config.el +++ b/modules/org-drill-config.el @@ -32,10 +32,23 @@ "Return the drill Org file names directly inside DIR (no leading dots)." (directory-files dir nil "^[^.].*\\.org$")) +(defun cj/--drill-files-or-error (dir) + "Return the drill Org files in DIR, or signal a clear `user-error'. +Errors when DIR is missing, unreadable, or has no drill files, so callers +fail with an actionable message instead of a low-level `directory-files' +error or an empty `completing-read'. This is the single entry point the +drill commands and the drill capture templates share." + (unless (and (file-directory-p dir) (file-readable-p dir)) + (user-error "Drill directory missing or unreadable: %s" dir)) + (let ((files (cj/--drill-files-in dir))) + (unless files + (user-error "No drill files (.org) found in %s" dir)) + files)) + (defun cj/--drill-pick-file (dir) "Prompt for one of the drill Org files in DIR; return its absolute path." (expand-file-name - (completing-read "Choose flashcard file: " (cj/--drill-files-in dir) nil t) + (completing-read "Choose flashcard file: " (cj/--drill-files-or-error dir) nil t) dir)) (defun cj/--drill-pick-dir (other-dir) |