Merge pull request #104 from hackberrydev/file-repository-errors

Return array of errors from file repository

Author: strika

src/alas.janet

@@ -9,6 +9,9 @@
 (import ./plan/parser :as plan_parser)
 (import ./plan/serializer :as plan_serializer)
 
+(defn- print-errors [errors]
+  (each error errors (print (string error "."))))
+
 # Keep commands sorted alphabetically.
 (def argparse-params
   ["A command line utility for planning your days"
@@ -37,9 +40,9 @@
 
 (defn- run-with-file-path [arguments file-path]
   (def load-file-result (file_repository/load file-path))
-  (def error (load-file-result :error))
-  (if error
-    (print error)
+  (def errors (load-file-result :errors))
+  (if errors
+    (print-errors errors)
     (let [plan-string (load-file-result :text)
           parse-result (plan_parser/parse plan-string)
           parse-error (parse-result :error)

src/commands.janet

@@ -12,7 +12,6 @@
 (import ./commands/stats)
 
 (import ./date :as d)
-(import ./file_repository)
 (import ./schedule_parser)
 
 # backup command needs to be first

src/commands/schedule_tasks.janet

@@ -49,7 +49,7 @@
           (task/mark-as-missed task (day :date))))
        tasks))
 
-(defn- format-parse-errors [errors]
+(defn- format-errors [errors]
   (map (fn [error] (string command " " (string/ascii-lower error) ".")) errors))
 
 ## —————————————————————————————————————————————————————————————————————————————————————————————————
@@ -72,12 +72,12 @@
   (def argument (arguments "schedule-tasks"))
   (if argument
     (let [load-file-result (file_repository/load argument)
-          error (load-file-result :error)]
-      (if error
-        {:errors [(string command " " (string/ascii-lower error))]}
+          errors (load-file-result :errors)]
+      (if errors
+        {:errors (format-errors errors)}
         (let [parse-result (schedule_parser/parse (load-file-result :text))
               errors (parse-result :errors)]
           (if errors
-            {:errors (format-parse-errors errors)}
+            {:errors (format-errors errors)}
             {:command [schedule-tasks (parse-result :tasks) (date/today)]}))))
     {}))

src/file_repository.janet

@@ -28,5 +28,5 @@
   ```
   [path]
   (if (= (os/stat path) nil)
-    {:error "File does not exist."}
+    {:errors ["File does not exist"]}
     {:text (string (file/read (file/open path) :all))}))

test/file_repository_test.janet

@@ -43,6 +43,6 @@
 
 (deftest load-from-file-that-does-not-exist
   (let [result (load "missing_file.md")]
-    (is (= "File does not exist." (result :error)))))
+    (is (= "File does not exist" (first (result :errors))))))
 
 (run-tests!)