Merge pull request #712 from onflow/improvement/flowser-path

Change default Flowser path on Windows

Author: devbugging

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/onflow/flow-cli/pkg/flowkit v0.0.0-20221123090817-587405125c1f
 	github.com/onflow/flow-emulator v0.38.1
 	github.com/onflow/flow-go-sdk v0.29.1
-	github.com/onflowser/flowser/v2 v2.0.8-beta
+	github.com/onflowser/flowser/v2 v2.0.9-beta
 	github.com/pkg/errors v0.9.1
 	github.com/psiemens/sconfig v0.1.0
 	github.com/spf13/afero v1.9.2

go.sum

@@ -711,8 +711,8 @@ github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20220714155620-011db20f
 github.com/onflow/nft-storefront/lib/go/contracts v0.0.0-20220714155620-011db20fe754/go.mod h1:E3ScfQb5XcWJCIAdtIeEnr5i5l2y60GT0BTXeIHseWg=
 github.com/onflow/sdks v0.4.4 h1:aJPGJJLAN+mlBWAQxsyuJXeRRMFeLwU6Mp4e/YL6bdU=
 github.com/onflow/sdks v0.4.4/go.mod h1:F0dj0EyHC55kknLkeD10js4mo14yTdMotnWMslPirrU=
-github.com/onflowser/flowser/v2 v2.0.8-beta h1:cTnrn4OOsqwI1FrkSKBLs6D8xEHYTKV5q4pgADw2rV0=
-github.com/onflowser/flowser/v2 v2.0.8-beta/go.mod h1:g/nfelBOx0A4j60Twsr7GsmKapr2oxtRZQS0lwPHgZY=
+github.com/onflowser/flowser/v2 v2.0.9-beta h1:U59WUu/u0ZPDlbFcGs66fVjYektxqeunAPQLK0no2jA=
+github.com/onflowser/flowser/v2 v2.0.9-beta/go.mod h1:g/nfelBOx0A4j60Twsr7GsmKapr2oxtRZQS0lwPHgZY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=

internal/settings/defaults.go

@@ -48,7 +48,7 @@ func getDefaultInstallDir() string {
 	case Windows:
 		// https://superuser.com/questions/1327037/what-choices-do-i-have-about-where-to-install-software-on-windows-10
 		user, _ := user.Current() // safe to ignore cache errors
-		return fmt.Sprintf(`%s\AppData\Local`, user.HomeDir)
+		return fmt.Sprintf(`%s\AppData\Local\Programs`, user.HomeDir)
 	default:
 		return ""
 	}

internal/tools/flowser.go

@@ -97,10 +97,18 @@ func runFlowser(
 
 func installFlowser(flowser *flowser.App, installPath string) (string, error) {
 	fmt.Println("It looks like Flowser is not yet installed on your system.")
-	if !output.InstallPrompt() {
+	installChoice := output.InstallPrompt()
+	if installChoice == output.CancelInstall {
 		return "", fmt.Errorf("user denied install")
 	}
 
+	// if user says it already installed it we only ask for path and return it
+	if installChoice == output.AlreadyInstalled {
+		installPath = output.InstallPathPrompt(installPath)
+		_ = settings.SetFlowserPath(installPath)
+		return installPath, nil
+	}
+
 	// we only allow custom paths on Windows since on MacOS apps needs to be installed inside Application folder
 	if runtime.GOOS == settings.Windows {
 		installPath = output.InstallPathPrompt(installPath)
@@ -111,7 +119,13 @@ func installFlowser(flowser *flowser.App, installPath string) (string, error) {
 	logger.StartProgress(fmt.Sprintf("%s Installing Flowser, this may take few minutes, please wait ", output.TryEmoji()))
 	defer logger.StopProgress()
 
-	err := flowser.Install(installPath)
+	// create all folders if they don't exist, does nothing if they exist
+	err := os.MkdirAll(installPath, os.ModePerm)
+	if err != nil {
+		return "", err
+	}
+
+	err = flowser.Install(installPath)
 	if err != nil {
 		return "", fmt.Errorf("could not install Flowser: %w", err)
 	}

pkg/flowkit/output/prompt.go

@@ -600,32 +600,39 @@ func WantToUseMainnetVersionPrompt() bool {
 	return useMainnetVersion == "Yes"
 }
 
-func InstallPrompt() bool {
-	prompt := promptui.Prompt{
-		Label:       "Do you wish to install it",
-		Default:     "Y",
-		IsConfirm:   true,
-		HideEntered: true,
+const CancelInstall = 1
+const AlreadyInstalled = 2
+
+func InstallPrompt() int {
+	prompt := promptui.Select{
+		Label: "Do you wish to install it",
+		Items: []string{"Yes", "No", "I've already installed it"},
 	}
-	selected, err := prompt.Run()
+	index, _, err := prompt.Run()
 	if err == promptui.ErrInterrupt {
 		os.Exit(-1)
 	}
 
-	return strings.ToLower(selected) == "y" || selected == ""
+	return index
 }
 
 func InstallPathPrompt(defaultPath string) string {
 	prompt := promptui.Prompt{
 		Label:   "Install path",
 		Default: defaultPath,
 		Validate: func(s string) error {
-			if s != "" {
-				_, err := os.Stat(s)
-				return err
+			if _, err := os.Stat(s); err == nil {
+				return nil
 			}
 
-			return nil
+			// Attempt to create it
+			var d []byte
+			if err := os.WriteFile(s, d, 0644); err == nil {
+				os.Remove(s) // And delete it
+				return nil
+			}
+
+			return fmt.Errorf("path is invalid")
 		},
 	}