log loaded ini files

Author: atomicptr

src/defold/focus.clj

@@ -2,8 +2,8 @@
   (:require
    [babashka.fs :as fs]
    [defold.constants :refer [base-class-name]]
-   [defold.mini :as mini]
-   [defold.utils :refer [command-exists? determine-os project-id run-shell]]
+   [defold.utils :refer [command-exists? determine-os load-ini project-id
+                         run-shell]]
    [taoensso.timbre :as log]))
 
 (defn switch-focus [type name]
@@ -97,7 +97,7 @@
     (assert (some? root-dir))
     (let [game-project (fs/path root-dir "game.project")
           _            (assert (fs/exists? game-project))
-          config       (mini/parse-string (slurp (str game-project)))
+          config       (load-ini game-project)
           title        (get-in config ["project" "title"])
           _            (assert (some? title))]
       (case (determine-os)

src/defold/mini.clj

@@ -137,9 +137,10 @@
           (let [k value
                 tokens (expect-token (rest tokens) :equal)
                 [v tokens] (case (peek-token tokens)
-                             :ident  (consume-token tokens)
-                             :string (consume-token tokens)
-                             (parser-error (format "Unexpected token: %s" (ffirst tokens)) (last (first tokens))))
+                             :ident   (consume-token tokens)
+                             :string  (consume-token tokens)
+                             :newline [nil tokens]
+                             (parser-error (format "Unexpected token (line): %s" (ffirst tokens)) (last (first tokens))))
                 tokens     (expect-token tokens [:newline :eof])]
             (if current-section
               (recur tokens (assoc-in result (concat current-section [k]) v) current-section nil)

src/defold/project.clj

@@ -2,9 +2,8 @@
   (:require
    [babashka.fs :as fs]
    [clojure.string :as string]
-   [defold.mini :as mini]
    [defold.script-api-compiler :as script-api-compiler]
-   [defold.utils :as utils]
+   [defold.utils :as utils :refer [load-ini]]
    [taoensso.timbre :as log])
   (:import
    [java.nio.charset StandardCharsets]
@@ -55,7 +54,7 @@
   (let [game-projects (find-game-project-files in-dir)]
     (flatten (map (fn [game-project]
                     (let [project-dir (fs/parent game-project)
-                          config      (mini/parse-string (slurp (str game-project)))
+                          config      (load-ini game-project)
                           libs        (get-in config ["library" "include_dirs"])]
                       (map #(str (fs/path project-dir %)) (string/split libs #","))))
                game-projects))))
@@ -87,7 +86,7 @@
          (fs/delete-tree deps-dir)
          (fs/delete-tree cache-dir))
        (let [ident     (make-ident game-project-file)
-             ini       (mini/parse-string (slurp game-project-file))
+             ini       (load-ini game-project-file)
              deps      (get-dependencies ini)
              deps-dir  (deps-dir ident)
              cache-dir (cache-dir ident)]

src/defold/utils.clj

@@ -5,6 +5,7 @@
    [babashka.process :refer [shell]]
    [clojure.java.io :as io]
    [clojure.string :as string]
+   [defold.mini :as mini]
    [taoensso.timbre :as log]))
 
 (defn command-exists? [cmd]
@@ -129,3 +130,7 @@
 
 (defn project-id [project-root]
   (subs (sha3 project-root) 0 8))
+
+(defn load-ini [path]
+  (log/debug "Loading .ini file" (str path))
+  (mini/parse-string (slurp (str path))))