Improve config (json) file creation

.env

@@ -1 +0,0 @@
-DATABASE_URL="sqlite://emgauwa-dev.sqlite"

.gitignore

@@ -1,15 +1,8 @@
-/target/
-
-/tests/testing/
-/tests/testing_bak/
-/tests/testing_latest/
-
-emgauwa-*.sqlite
-emgauwa-*.sqlite-*
-emgauwa-*.json
-
-
-# Added by cargo
-
 /target
+
+/.env
 /api.http
+
+/emgauwa-*.sqlite
+/emgauwa-*.sqlite-*
+/emgauwa-*.json

Makefile

@@ -1,5 +1,13 @@
+ifneq (,$(wildcard ./.env))
+    include .env
+    export
+endif
+
+DATABASE_URL ?= sqlite://emgauwa-dev.sqlite
+export DATABASE_URL
+
 sqlx:
-	cargo sqlx database drop
+	cargo sqlx database drop -y
 	cargo sqlx database create
 	cargo sqlx migrate run
 	cargo sqlx prepare --workspace
@@ -7,9 +15,16 @@ sqlx:
 build-rpi:
 	cross build --target arm-unknown-linux-gnueabihf
 
-emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl
+emgauwa-%.json: config/emgauwa-%.pkl config/lib/%.pkl config/lib/common.pkl $(wildcard .env)
 	pkl eval -f json -o $@ $<
 
 configs:
 	$(MAKE) emgauwa-core.json
 	$(MAKE) emgauwa-controller.json
+
+clean:
+	rm -f emgauwa-controller.json
+	rm -f emgauwa-controller.sqlite
+	rm -f emgauwa-core.json
+	rm -f emgauwa-core.sqlite
+	rm -f emgauwa-dev.sqlite

config/emgauwa-controller.pkl

@@ -13,7 +13,7 @@ permissions {
 }
 
 logging {
-	level = "DEBUG"
+  level = read?("env:LOGGING_LEVEL") ?? "DEBUG"
   file = "stdout"
 }
 

config/emgauwa-core.pkl

@@ -13,6 +13,6 @@ permissions {
 }
 
 logging {
-	level = "DEBUG"
+  level = read?("env:LOGGING_LEVEL") ?? "DEBUG"
   file = "stdout"
 }

config/lib/common.pkl

@@ -10,6 +10,6 @@ class PermissionsConfig {
 }
 
 class LoggingConfig {
-	level: String
+  level: "TRACE"|"DEBUG"|"INFO"|"WARN"|"ERROR"|"FATAL"
   file: String
 }