lib: add tests and code for nonexistant files and malformed globs

hledger-lib/Hledger/Read/JournalReader.hs

@@ -204,11 +204,17 @@ includedirectivep = do
   void newline
 
   where
-    getFilePaths curdir fileglob =
+    getFilePaths curdir filename = do
-        if isLiteral (compile fileglob)
+        -- Compiling filename as a glob pattern works even if it is a literal
-            -- </> and globDir1 correctly handle case when 'fileglob' is absolute
+        fileglob <- case tryCompileWith compDefault{errorRecovery=False} filename of
-            then pure [curdir </> fileglob]
+            Right x -> pure x
-            else liftIO $ globDir1 (compile fileglob) curdir
+            Left e -> fail $ "Invalid glob pattern: " ++ e
+        -- Get all matching files in the current working directory
+        filepaths <- liftIO $ globDir1 fileglob curdir
+        if (not . null) filepaths
+            then pure filepaths
+            else fail $ "No existing files match pattern: " ++ filename
+
     parseChild parentpos filepath = do
         childInput <- lift $ readFilePortably filepath
                              `orRethrowIOError` (show parentpos ++ " reading " ++ filepath)

tests/journal/include.test

@@ -48,3 +48,15 @@ include *y.journal
     (B)               1
 
 >>>=0
+
+# 4. include invalid glob patterns
+hledger -f - print
+<<<
+include [.journal
+>>>=1
+
+# 5. include nonexsitant file
+hledger -f - print
+<<<
+include doesnotexist.journal
+>>>=1