diff --git a/README.org b/README.org index 8794c33..f11d2b1 100644 --- a/README.org +++ b/README.org @@ -475,6 +475,11 @@ Simple links may also be written manually in either sexp or non-sexp form, like: *Acknowledgments* + [[https://github.com/tpeacock19][tpeacock19]] for extensive help testing new features in this version. +** 0.4.7 + +*Fixed* ++ Give a useful error if =org-ql-search-directories-files= is called without a directories argument and =org-directory= doesn't exist. (Fixes [[https://github.com/alphapapa/org-ql/issues/139][#139]]. Thanks to [[https://github.com/matthuszagh][Matt Huszagh]] for reporting.) + ** 0.4.6 *Fixed* diff --git a/org-ql-search.el b/org-ql-search.el index 59d57d5..c43573d 100644 --- a/org-ql-search.el +++ b/org-ql-search.el @@ -331,9 +331,12 @@ For example, an org-ql dynamic block header could look like: ;;;; Functions -(cl-defun org-ql-search-directories-files (&key (directories (list org-directory)) - (recurse org-ql-search-directories-files-recursive) - (regexp org-ql-search-directories-files-regexp)) +(cl-defun org-ql-search-directories-files + (&key (directories (if (file-exists-p org-directory) + (list org-directory) + (user-error "org-ql-search-directories-files: No DIRECTORIES given, and `org-directory' doesn't exist"))) + (recurse org-ql-search-directories-files-recursive) + (regexp org-ql-search-directories-files-regexp)) "Return list of matching files in DIRECTORIES, a list of directory paths. When RECURSE is non-nil, recurse into subdirectories. When REGEXP is non-nil, only return files that match REGEXP." diff --git a/org-ql.info b/org-ql.info index 9739c60..abf347a 100644 --- a/org-ql.info +++ b/org-ql.info @@ -67,6 +67,7 @@ Functions / Macros Changelog * 0.5-pre: 05-pre. +* 0.4.7: 047. * 0.4.6: 046. * 0.4.5: 045. * 0.4.4: 044. @@ -813,6 +814,7 @@ releases. * Menu: * 0.5-pre: 05-pre. +* 0.4.7: 047. * 0.4.6: 046. * 0.4.5: 045. * 0.4.4: 044. @@ -830,7 +832,7 @@ releases. * 0.1: 01.  -File: README.info, Node: 05-pre, Next: 046, Up: Changelog +File: README.info, Node: 05-pre, Next: 047, Up: Changelog 5.1 0.5-pre =========== @@ -865,9 +867,22 @@ File: README.info, Node: 05-pre, Next: 046, Up: Changelog testing new features in this version.  -File: README.info, Node: 046, Next: 045, Prev: 05-pre, Up: Changelog +File: README.info, Node: 047, Next: 046, Prev: 05-pre, Up: Changelog -5.2 0.4.6 +5.2 0.4.7 +========= + +*Fixed* + • Give a useful error if org-ql-search-directories-files is called + without a directories argument and org-directory doesn’t exist. + (Fixes #139 (https://github.com/alphapapa/org-ql/issues/139). + Thanks to Matt Huszagh (https://github.com/matthuszagh) for + reporting.) + + +File: README.info, Node: 046, Next: 045, Prev: 047, Up: Changelog + +5.3 0.4.6 ========= *Fixed* @@ -880,7 +895,7 @@ File: README.info, Node: 046, Next: 045, Prev: 05-pre, Up: Changelog  File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog -5.3 0.4.5 +5.4 0.4.5 ========= *Fixed* @@ -892,7 +907,7 @@ File: README.info, Node: 045, Next: 044, Prev: 046, Up: Changelog  File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog -5.4 0.4.4 +5.5 0.4.4 ========= *Fixed* @@ -904,7 +919,7 @@ File: README.info, Node: 044, Next: 043, Prev: 045, Up: Changelog  File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog -5.5 0.4.3 +5.6 0.4.3 ========= *Fixed* @@ -914,7 +929,7 @@ File: README.info, Node: 043, Next: 042, Prev: 044, Up: Changelog  File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog -5.6 0.4.2 +5.7 0.4.2 ========= *Fixed* @@ -923,7 +938,7 @@ File: README.info, Node: 042, Next: 041, Prev: 043, Up: Changelog  File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog -5.7 0.4.1 +5.8 0.4.1 ========= *Fixed* @@ -933,7 +948,7 @@ File: README.info, Node: 041, Next: 04, Prev: 042, Up: Changelog  File: README.info, Node: 04, Next: 032, Prev: 041, Up: Changelog -5.8 0.4 +5.9 0.4 ======= _Note:_ The next release, 0.5, may include changes which will require @@ -1014,8 +1029,8 @@ as they will be pushed to the master branch when ready.  File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog -5.9 0.3.2 -========= +5.10 0.3.2 +========== *Fixed* • In org-ql-search, accept symbol as ‘:super-groups’ argument. @@ -1027,7 +1042,7 @@ File: README.info, Node: 032, Next: 031, Prev: 04, Up: Changelog  File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog -5.10 0.3.1 +5.11 0.3.1 ========== *Fixed* @@ -1037,7 +1052,7 @@ File: README.info, Node: 031, Next: 03, Prev: 032, Up: Changelog  File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog -5.11 0.3 +5.12 0.3 ======== *Added* @@ -1102,7 +1117,7 @@ File: README.info, Node: 03, Next: 023, Prev: 031, Up: Changelog  File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog -5.12 0.2.3 +5.13 0.2.3 ========== *Fixed* @@ -1112,7 +1127,7 @@ File: README.info, Node: 023, Next: 022, Prev: 03, Up: Changelog  File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog -5.13 0.2.2 +5.14 0.2.2 ========== *Fixed* @@ -1123,7 +1138,7 @@ File: README.info, Node: 022, Next: 021, Prev: 023, Up: Changelog  File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog -5.14 0.2.1 +5.15 0.2.1 ========== *Fixed* @@ -1133,7 +1148,7 @@ File: README.info, Node: 021, Next: 02, Prev: 022, Up: Changelog  File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog -5.15 0.2 +5.16 0.2 ======== *Added* @@ -1216,7 +1231,7 @@ File: README.info, Node: 02, Next: 01, Prev: 021, Up: Changelog  File: README.info, Node: 01, Prev: 02, Up: Changelog -5.16 0.1 +5.17 0.1 ======== First tagged release. @@ -1274,50 +1289,51 @@ GPLv3  Tag Table: Node: Top225 -Node: Contents1549 -Node: Screenshots1672 -Node: Installation1790 -Node: Quelpa2428 -Node: Usage2871 -Node: Commands3269 -Node: org-ql-search3742 -Node: helm-org-ql5392 -Node: org-ql-view5804 -Node: org-ql-view-sidebar6304 -Node: org-ql-view-recent-items6660 -Node: org-ql-sparse-tree7144 -Node: Queries7944 -Node: Non-sexp query syntax8852 -Node: General predicates10559 -Node: Ancestor/descendant predicates15972 -Node: Date/time predicates17100 -Node: Functions / Macros19755 -Node: Agenda-like views20010 -Node: Listing / acting-on results21415 -Node: Dynamic block26017 -Node: Links28715 -Node: Tips29402 -Node: Changelog29720 -Node: 05-pre30359 -Node: 04631598 -Node: 04532001 -Node: 04432360 -Node: 04332717 -Node: 04232912 -Node: 04133071 -Node: 0433310 -Node: 03237241 -Node: 03137618 -Node: 0337815 -Node: 02340790 -Node: 02241018 -Node: 02141286 -Node: 0241485 -Node: 0145520 -Node: Notes45621 -Node: Comparison with Org Agenda searches45783 -Node: org-sidebar46655 -Node: License46934 +Node: Contents1564 +Node: Screenshots1687 +Node: Installation1805 +Node: Quelpa2443 +Node: Usage2886 +Node: Commands3284 +Node: org-ql-search3757 +Node: helm-org-ql5407 +Node: org-ql-view5819 +Node: org-ql-view-sidebar6319 +Node: org-ql-view-recent-items6675 +Node: org-ql-sparse-tree7159 +Node: Queries7959 +Node: Non-sexp query syntax8867 +Node: General predicates10574 +Node: Ancestor/descendant predicates15987 +Node: Date/time predicates17115 +Node: Functions / Macros19770 +Node: Agenda-like views20025 +Node: Listing / acting-on results21430 +Node: Dynamic block26032 +Node: Links28730 +Node: Tips29417 +Node: Changelog29735 +Node: 05-pre30389 +Node: 04731628 +Node: 04632026 +Node: 04532426 +Node: 04432785 +Node: 04333142 +Node: 04233337 +Node: 04133496 +Node: 0433735 +Node: 03237666 +Node: 03138045 +Node: 0338242 +Node: 02341217 +Node: 02241445 +Node: 02141713 +Node: 0241912 +Node: 0145947 +Node: Notes46048 +Node: Comparison with Org Agenda searches46210 +Node: org-sidebar47082 +Node: License47361  End Tag Table