From 132a7a8ba5a80938993db7fa712048ea885283c4 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Wed, 13 Apr 2022 14:51:01 +0200
Subject: [PATCH] Added int support to env; fixed apparently broken defaults

---
 src/env/env.v | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/env/env.v b/src/env/env.v
index cbde67e1..01248506 100644
--- a/src/env/env.v
+++ b/src/env/env.v
@@ -55,27 +55,41 @@ pub fn load<T>(path string) ?T {
 		$for field in T.fields {
 			s := doc.value(field.name)
 
-			// We currently only support strings
-			if s.type_name() == 'string' {
-				res.$(field.name) = s.string()
+			if s !is toml.Null {
+				$if field.typ is string {
+					res.$(field.name) = s.string()
+				}$else $if field.typ is int {
+					res.$(field.name) = s.int()
+				}
 			}
 		}
 	}
 
 	$for field in T.fields {
-		$if field.typ is string {
-			env_value := get_env_var(field.name) ?
+		env_value := get_env_var(field.name) ?
 
-			// The value of the env var will always be chosen over the config
-			// file
-			if env_value != '' {
+		// The value of an env var will always take precedence over the toml
+		// file.
+		if env_value != '' {
+			$if field.typ is string {
 				res.$(field.name) = env_value
+			} $else $if field.typ is int {
+				res.$(field.name) = env_value.int()
 			}
-			// If there's no value from the toml file either, we try to find a
-			// default value
-			else if res.$(field.name) == '' {
-				return error("Missing config variable '$field.name' with no provided default. Either add it to the config file or provide it using an environment variable.")
-			}
+		}
+
+		// Now, we check whether a value is present. If there isn't, that means
+		// it isn't in the config file, nor is there a default or an env var.
+		mut has_value := false
+
+		$if field.typ is string {
+			has_value = res.$(field.name) != ''
+		} $else $if field.typ is int {
+			has_value = res.$(field.name) != 0
+		}
+
+		if !has_value {
+			return error("Missing config variable '$field.name' with no provided default. Either add it to the config file or provide it using an environment variable.")
 		}
 	}
 	return res