Replaces .env with config.toml

.gitignore

@@ -1,3 +1,4 @@
 .vscode/
 go.work
 *.code-workspace
+*.toml

CLI/.gitignore

@@ -12,6 +12,6 @@ BisonExmple.txt
 delme.sh
 *.txt
 .history
-.env
+*.toml
 *.ocli
 *.toml

CLI/README.md

@@ -26,10 +26,6 @@ For Linux, consult your respective Distribution docs
 
   Clone the CLI repository  
   Execute make. It should automatically retrieve the necessary libraries. If not then execute the commands below 
-  ```
-  go get github.com/blynn/nex
-  go get -u github.com/cznic/goyacc
-  ```  
 
     make
 
@@ -38,15 +34,14 @@ For Linux, consult your respective Distribution docs
 
 Running
 -------------
-You must first have a ```.env``` file to be included in the same directory as the executable. If not included the CLI will exit on startup with an error message about this file.   
+You must first have a ```config.toml``` file to be included in the parent directory of the executable. If not included the CLI will exit on startup with an error message about this file.   
+See https://github.com/ditrit/OGrEE-Core/blob/main/README.md for an example.
 
-You can view an example ```.env``` file here: https://ogree.ditrit.io/htmls/clienv.html  
-
- - Execute ```./main```
+ - Execute ```./cli``` (or cli.exe on windows)
 
 If this is the first running the Shell, you will be greeted with a sign up prompt to input a user email and password. 
 
-DO NOT SHARE YOUR ```.env``` file since it contains your credentials 
+DO NOT SHARE YOUR ```config.toml``` file since it contains your credentials 
 
 Usage & Notes
 -------------

CLI/ast.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"cli/config"
 	cmd "cli/controllers"
 	"encoding/json"
 	"fmt"
@@ -20,6 +21,23 @@ func GetDynamicSymbolTable() map[string]interface{} {
 	return dynamicSymbolTable
 }
 
+func InitVars(variables []config.Vardef) error {
+	for _, v := range variables {
+		varNode, _, err := parseRawText(lexQuotedString, newFrame(v.Value))
+		if err != nil {
+			return err
+		}
+		n := &assignNode{
+			variable: v.Name,
+			val:      varNode,
+		}
+		if _, err := n.execute(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 type node interface {
 	execute() (interface{}, error)
 }

CLI/config/config.go

@@ -0,0 +1,106 @@
+package config
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+
+	"github.com/BurntSushi/toml"
+	flag "github.com/spf13/pflag"
+)
+
+type globalConfig struct {
+	Conf Config `toml:"OGrEE-CLI"`
+}
+
+type Vardef struct {
+	Name  string
+	Value string
+}
+
+type Config struct {
+	Verbose      string
+	APIURL       string
+	UnityURL     string
+	UnityTimeout string
+	ConfigPath   string
+	HistPath     string
+	Script       string
+	Drawable     []string
+	DrawableJson map[string]string
+	DrawLimit    int
+	Updates      []string
+	User         string
+	APIKEY       string
+	Variables    []Vardef
+}
+
+// Used for parsing (via JSON) into conf after parsing TOML
+// since an object can only be decoded by TOML once
+type ArgStruct struct {
+	ConfigPath string `json:",omitempty"`
+	Verbose    string `json:",omitempty"`
+	UnityURL   string `json:",omitempty"`
+	APIURL     string `json:",omitempty"`
+	APIKEY     string `json:",omitempty"`
+	HistPath   string `json:",omitempty"`
+	Script     string `json:",omitempty"`
+}
+
+func defaultConfig() Config {
+	return Config{
+		Verbose:      "ERROR",
+		APIURL:       "",
+		UnityURL:     "",
+		UnityTimeout: "10ms",
+		ConfigPath:   "../config.toml",
+		HistPath:     "./.history",
+		Script:       "",
+		Drawable:     []string{"all"},
+		DrawableJson: map[string]string{},
+		DrawLimit:    50,
+		Updates:      []string{"all"},
+		User:         "",
+		APIKEY:       "",
+		Variables:    []Vardef{},
+	}
+}
+
+func ReadConfig() *Config {
+	globalConf := globalConfig{
+		Conf: defaultConfig(),
+	}
+	args := ArgStruct{}
+	conf := &globalConf.Conf
+
+	flag.StringVarP(&args.ConfigPath, "conf_path", "c", conf.ConfigPath,
+		"Indicate the location of the Shell's config file")
+	flag.StringVarP(&args.Verbose, "verbose", "v", conf.Verbose,
+		"Indicates level of debugging messages."+
+			"The levels are of in ascending order:"+
+			"{NONE,ERROR,WARNING,INFO,DEBUG}.")
+	flag.StringVarP(&args.UnityURL, "unity_url", "u", conf.UnityURL, "Unity URL")
+	flag.StringVarP(&args.APIURL, "api_url", "a", conf.APIURL, "API URL")
+	flag.StringVarP(&args.APIKEY, "api_key", "k", conf.APIKEY, "Indicate the key of the API")
+	flag.StringVarP(&args.HistPath, "history_path", "h", conf.HistPath,
+		"Indicate the location of the Shell's history file")
+	flag.StringVarP(&args.Script, "file", "f", conf.Script, "Launch the shell as an interpreter "+
+		" by only executing an OCLI script file")
+	flag.Parse()
+
+	configBytes, err := os.ReadFile(args.ConfigPath)
+	if err != nil {
+		fmt.Println("Cannot read config file", conf.ConfigPath, ":", err.Error())
+		fmt.Println("Please ensure that you have a properly formatted config file saved as 'config.toml' in the parent directory")
+		fmt.Println("For more details please refer to: https://github.com/ditrit/OGrEE-Core/blob/main/README.md")
+	}
+	_, err = toml.Decode(string(configBytes), &globalConf.Conf)
+	if err != nil {
+		println("Error reading config :", err.Error())
+	}
+
+	argBytes, _ := json.Marshal(args)
+	json.Unmarshal(argBytes, &conf)
+
+	return conf
+}

CLI/controllers/commandController.go

@@ -827,14 +827,14 @@ func LSOG() {
 	fmt.Println("OGREE Shell Information")
 	fmt.Println("********************************************")
 
-	fmt.Println("USER EMAIL:", GetEmail())
+	fmt.Println("USER EMAIL:", State.UserEmail)
 	fmt.Println("API URL:", State.APIURL+"/api/")
 	fmt.Println("UNITY URL:", State.UnityClientURL)
 	fmt.Println("BUILD DATE:", BuildTime)
 	fmt.Println("BUILD TREE:", BuildTree)
 	fmt.Println("BUILD HASH:", BuildHash)
 	fmt.Println("COMMIT DATE: ", GitCommitDate)
-	fmt.Println("ENV FILE PATH: ", State.EnvFilePath)
+	fmt.Println("CONFIG FILE PATH: ", State.ConfigPath)
 	fmt.Println("LOG PATH:", "./log.txt")
 	fmt.Println("HISTORY FILE PATH:", State.HistoryFilePath)
 	fmt.Println("DEBUG LEVEL: ", State.DebugLvl)
@@ -881,7 +881,7 @@ func Env(userVars, userFuncs map[string]interface{}) {
 	fmt.Println()
 	fmt.Println("Objects Unity shall be informed of upon update:")
 	for _, k := range State.ObjsForUnity {
-		fmt.Println(EntityToString(k))
+		fmt.Println(k)
 	}
 	fmt.Println()
 	fmt.Println("Objects Unity shall draw:")