fix cli application

Author: numkem

cmd/cli/cmd_add.go

@@ -46,30 +46,30 @@ func addCmdRun(cmd *cobra.Command, args []string) {
 	name := cmd.Flag("name").Value.String()
 
 	// Try to read the file to see if we can find headers
-	s, err := scriptLib.ReadFile(args[0])
+	scr, err := scriptLib.ReadFile(args[0])
 	if err != nil {
 		cmd.PrintErrf("failed to read the script file %s: %v", args[0], err)
 		return
 	}
 	if subject == "" {
-		if s.Subject == "" {
+		if scr.Subject == "" {
 			cmd.PrintErrf("subject is required")
 			return
 		}
 
-		subject = s.Subject
+		subject = scr.Subject
 	}
 	if name == "" {
-		if s.Name == "" {
+		if scr.Name == "" {
 			cmd.PrintErrf("name is required")
 			return
 		}
 
-		name = s.Name
+		name = scr.Name
 	}
 
 	// Add the script to etcd under the given subject
-	err = scriptStore.AddScript(cmd.Context(), subject, name, s.Content)
+	err = scriptStore.AddScript(cmd.Context(), subject, name, scr)
 	if err != nil {
 		cmd.PrintErrf("Failed to add script to etcd: %v", err)
 		return

cmd/cli/cmd_dev.go

@@ -53,31 +53,31 @@ func devCmdRun(cmd *cobra.Command, args []string) {
 	name := cmd.Flag("name").Value.String()
 
 	// Try to read the file to see if we can find headers
-	s, err := scriptLib.ReadFile(args[0])
+	scr, err := scriptLib.ReadFile(args[0])
 	if err != nil {
 		log.Errorf("failed to read the script file %s: %v\n", args[0], err)
 		return
 	}
 
 	if subject == "" {
-		if s.Subject == "" {
+		if scr.Subject == "" {
 			cmd.PrintErrf("subject is required\n")
 			return
 		}
 
-		subject = s.Subject
+		subject = scr.Subject
 	}
 	if name == "" {
-		if s.Name == "" {
+		if scr.Name == "" {
 			cmd.PrintErrf("name is required\n")
 			return
 		}
 
-		name = s.Name
+		name = scr.Name
 	}
 
 	// Add the given script to the store
-	err = store.AddScript(cmd.Context(), subject, name, s.Content)
+	err = store.AddScript(cmd.Context(), subject, name, scr)
 	if err != nil {
 		cmd.PrintErrf("failed to add script to store: %v\n", err)
 		return

cmd/cli/cmd_devhttp.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/numkem/msgscript/executor"
 	msgplugin "github.com/numkem/msgscript/plugins"
+	"github.com/numkem/msgscript/script"
 	scriptLib "github.com/numkem/msgscript/script"
 	"github.com/numkem/msgscript/store"
 )
@@ -152,15 +153,16 @@ func (p *devHttpProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Add only the currently worked on file
-	b, err := os.ReadFile(p.scriptFile)
+	scr, err := script.ReadFile(p.scriptFile)
 	if err != nil {
 		e := fmt.Errorf("failed to read script file %s: %w", p.scriptFile, err)
 		log.Error(e.Error())
 		w.WriteHeader(http.StatusInternalServerError)
 		w.Write([]byte(e.Error()))
 		return
 	}
-	p.store.AddScript(p.context, s.Subject, s.Name, b)
+
+	p.store.AddScript(p.context, s.Subject, s.Name, scr)
 
 	// Create a new empty store at the end of each request
 	defer emptyStore(p.store, p.libraryDir)

flake.nix

@@ -8,7 +8,7 @@
   outputs =
     { self, nixpkgs }:
     let
-      version = "0.6.0";
+      version = "0.6.2";
       vendorHash = "sha256-LcgdJIsn3/fHv3NGvGdfq/Y3N7CTuIH/b5Rv5tEMUg8=";
 
       mkPlugin =