Allow url recipes

Signed-off-by: Peter Verraedt <peter@verraedt.be>

Author: peterverraedt

cmd/iron/cli/app.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/c-bata/go-prompt"
 	"github.com/creativeprojects/go-selfupdate"
+	"github.com/google/shlex"
 	"github.com/kuleuven/iron"
 	"github.com/kuleuven/iron/cmd/iron/shell"
 	"github.com/sirupsen/logrus"
@@ -76,7 +77,7 @@ func (a *App) Command() *cobra.Command {
 	shellCmd.PersistentPreRunE = a.ShellInit
 
 	// Open subcommand
-	openURLCmd := openCmd(rootCmd)
+	openURLCmd := a.xopen()
 
 	rootCmd.AddCommand(shellCmd, openURLCmd)
 
@@ -143,7 +144,7 @@ func (a *App) root(shellCommand bool) *cobra.Command {
 	return rootCmd
 }
 
-func openCmd(rootCmd *cobra.Command) *cobra.Command {
+func (a *App) xopen() *cobra.Command {
 	return &cobra.Command{
 		Use:   "x-open [url]",
 		Short: "Open a special url, for browser-initiated commands.",
@@ -154,38 +155,73 @@ func openCmd(rootCmd *cobra.Command) *cobra.Command {
 		SilenceErrors: true,
 		SilenceUsage:  true,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			parts, err := url.Parse(args[0])
+			commands, ok := strings.CutPrefix(args[0], a.name+"://")
+			if !ok {
+				return fmt.Errorf("invalid url, can only open %s:// urls", a.name)
+			}
+
+			commands, query, _ := strings.Cut(commands, "?")
+
+			options, err := url.ParseQuery(query)
 			if err != nil {
 				return err
 			}
 
-			args = []string{"--workdir", parts.Path, parts.Host}
+			rootCmd := a.root(options.Has("shell"))
+
+			for line := range strings.SplitSeq(commands, ";") {
+				line, err := url.QueryUnescape(line)
+				if err != nil {
+					return err
+				}
 
-			for urlarg := range strings.SplitSeq(parts.RawQuery, "&") {
-				if _, value, ok := strings.Cut(urlarg, "="); ok {
-					unescaped, err := url.QueryUnescape(value)
-					if err != nil {
-						return err
-					}
+				prefix := fmt.Sprintf("%s > %s", a.name, a.Workdir)
 
-					args = append(args, unescaped)
+				if a.Workdir == "" {
+					prefix = a.name
+				}
+
+				fmt.Fprintf(cmd.OutOrStdout(), "%s%s >%s %s\n", Blue, prefix, Reset, line)
+
+				if err = executeCommand(rootCmd, line); err != nil {
+					goto exit
 				}
 			}
 
-			rootCmd.SetArgs(args)
+			if options.Has("shell") {
+				// Drop to shell
+				hiddenChild := a.root(true)
+				hiddenChild.Hidden = true
+				rootCmd.AddCommand(hiddenChild)
 
-			err = rootCmd.ExecuteContext(cmd.Context())
+				shell.New(rootCmd, prompt.OptionLivePrefix(a.prefix)).Run(rootCmd, nil)
 
-			if parts.Host != "shell" {
-				fmt.Fprintf(cmd.OutOrStdout(), "[Press enter to exit]\n")
-				fmt.Scanln() //nolint:errcheck
+				return nil
 			}
 
+		exit:
+			fmt.Fprintf(cmd.OutOrStdout(), "[Press enter to exit]\n")
+
+			fmt.Scanln() //nolint:errcheck
+
 			return err
 		},
 	}
 }
 
+func executeCommand(cmd *cobra.Command, line string) error {
+	args, err := shlex.Split(line)
+	if err != nil {
+		return err
+	}
+
+	shell.ResetArgs(cmd, args)
+
+	cmd.SetArgs(args)
+
+	return cmd.ExecuteContext(cmd.Context())
+}
+
 func (a *App) prefix() (string, bool) {
 	return fmt.Sprintf("%s > %s > ", a.name, a.Workdir), true
 }

cmd/iron/cli/app_test.go

@@ -437,7 +437,7 @@ func TestXOpen(t *testing.T) {
 	cmd := app.Command()
 	cmd.SetContext(t.Context())
 
-	cmd.SetArgs([]string{"x-open", "iron://version"})
+	cmd.SetArgs([]string{"x-open", `test://version;local%20fls`})
 
 	if err := cmd.ExecuteContext(t.Context()); err != nil {
 		t.Fatal(err)

cmd/iron/shell/shell.go

@@ -176,7 +176,7 @@ func assert(err error) {
 }
 
 func execute(cmd *cobra.Command, args []string) error {
-	resetArgs(cmd, args)
+	ResetArgs(cmd, args)
 
 	cmd.SetArgs(args)
 
@@ -188,7 +188,7 @@ func execute(cmd *cobra.Command, args []string) error {
 	return cmd.ExecuteContext(ctx)
 }
 
-func resetArgs(cmd *cobra.Command, args []string) {
+func ResetArgs(cmd *cobra.Command, args []string) {
 	if cmd, _, err := cmd.Find(args); err == nil {
 		// Reset flag values between runs due to a limitation in Cobra
 		cmd.Flags().VisitAll(func(flag *pflag.Flag) {