refactor(bootstrapper): rework webview installation sequence; rename fns

Author: sewnie

cmd/vinegar/bootstrapper_setup.go

@@ -37,22 +37,18 @@ func (b *bootstrapper) setup() error {
 		stop()
 	}
 
-	if err := b.stepSetupDxvk(); err != nil {
-		return fmt.Errorf("dxvk dl: %w", err)
+	if err := b.setupDxvk(); err != nil {
+		return fmt.Errorf("dxvk: %w", err)
 	}
 
-	if err := b.stepWebviewDownload(); err != nil {
-		return fmt.Errorf("webview dl: %w", err)
+	if err := b.setupWebView(); err != nil {
+		return fmt.Errorf("webview: %w", err)
 	}
 
 	if err := b.setupDeployment(); err != nil {
 		return err
 	}
 
-	if err := b.stepWebviewInstall(); err != nil {
-		return fmt.Errorf("webview: %w", err)
-	}
-
 	if err := b.stepPrepareRun(); err != nil {
 		return err
 	}

cmd/vinegar/bootstrapper_setup_pfx.go

@@ -63,7 +63,7 @@ func (b *bootstrapper) setupPrefix() error {
 	return nil
 }
 
-func (b *bootstrapper) stepSetupDxvk() error {
+func (b *bootstrapper) setupDxvk() error {
 	// If DXVK is installed in the wineprefix, uninstallation
 	// won't be necessary if it's disabled as it still requires
 	// DLL overrides to be present.
@@ -116,37 +116,9 @@ install:
 	return nil
 }
 
-func (b *bootstrapper) webviewInstaller() string {
-	if b.cfg.Studio.WebView == "" {
-		return ""
-	}
-	return filepath.Join(dirs.Cache, "webview-"+b.cfg.Studio.WebView+".exe")
-}
-
-func (b *bootstrapper) stepWebviewDownload() error {
-	name := b.webviewInstaller()
-	if name == "" {
-		return nil
-	}
-
-	if _, err := os.Stat(name); err == nil {
-		return nil
-	}
+func (b *bootstrapper) setupWebView() error {
+	installer := filepath.Join(dirs.Cache, "webview-"+b.cfg.Studio.WebView+".exe")
 
-	stop := b.performing()
-	b.message("Fetching WebView", "upload", b.cfg.Studio.WebView)
-	webview2.Client.Transport.(*http.Transport).DisableCompression = true
-	d, err := webview2.Stable.Runtime(b.cfg.Studio.WebView, "x64")
-	if err != nil {
-		return fmt.Errorf("fetch: %w", err)
-	}
-	stop()
-
-	b.message("Downloading WebView", "catalog", d.Delivery.CatalogID)
-	return netutil.DownloadProgress(d.URL, name, &b.pbar)
-}
-
-func (b *bootstrapper) stepWebviewInstall() error {
 	new := b.cfg.Studio.WebView
 	b.message("Checking WebView", "version", new)
 
@@ -161,10 +133,24 @@ func (b *bootstrapper) stepWebviewInstall() error {
 		return nil
 	}
 
-	name := b.webviewInstaller()
+	if _, err := os.Stat(installer); err != nil {
+		stop := b.performing()
+		b.message("Fetching WebView", "upload", b.cfg.Studio.WebView)
+		webview2.Client.Transport.(*http.Transport).DisableCompression = true
+		d, err := webview2.Stable.Runtime(b.cfg.Studio.WebView, "x64")
+		if err != nil {
+			return fmt.Errorf("fetch: %w", err)
+		}
+		stop()
+
+		b.message("Downloading WebView", "catalog", d.Delivery.CatalogID)
+		if err := netutil.DownloadProgress(d.URL, installer, &b.pbar); err != nil {
+			return fmt.Errorf("download: %w", err)
+		}
+	}
 
-	b.message("Installing WebView", "path", name)
+	b.message("Installing WebView", "path", installer)
 	defer b.performing()()
 
-	return webview2.Install(b.pfx, name)
+	return webview2.Install(b.pfx, installer)
 }

cmd/vinegar/bootstrapper_setup_rblx.go

@@ -21,7 +21,7 @@ import (
 var studio = rbxweb.BinaryTypeWindowsStudio64
 
 func (b *bootstrapper) setupDeployment() error {
-	if err := b.stepFetchDeployment(); err != nil {
+	if err := b.setDeployment(); err != nil {
 		return fmt.Errorf("fetch: %w", err)
 	}
 	b.dir = filepath.Join(dirs.Versions, b.bin.GUID)
@@ -41,7 +41,7 @@ func (b *bootstrapper) setupDeployment() error {
 		return err
 	}
 
-	if err := b.stepSetupPackages(); err != nil {
+	if err := b.setupPackages(); err != nil {
 		return err
 	}
 
@@ -55,7 +55,7 @@ func (b *bootstrapper) setupDeployment() error {
 	return nil
 }
 
-func (b *bootstrapper) stepFetchDeployment() error {
+func (b *bootstrapper) setDeployment() error {
 	defer b.performing()()
 
 	if b.cfg.Studio.ForcedVersion != "" {
@@ -83,7 +83,7 @@ func (b *bootstrapper) stepFetchDeployment() error {
 	return nil
 }
 
-func (b *bootstrapper) stepSetupPackages() error {
+func (b *bootstrapper) setupPackages() error {
 	stop := b.performing()
 
 	b.message("Finding Mirror")
@@ -120,14 +120,14 @@ func (b *bootstrapper) stepSetupPackages() error {
 
 	stop()
 
-	if err := b.stepPackagesInstall(&m, pkgs, pd); err != nil {
+	if err := b.installPackages(&m, pkgs, pd); err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (b *bootstrapper) stepPackagesInstall(
+func (b *bootstrapper) installPackages(
 	mirror *rbxbin.Mirror,
 	pkgs []rbxbin.Package,
 	pdirs rbxbin.PackageDirectories,
@@ -139,7 +139,7 @@ func (b *bootstrapper) stepPackagesInstall(
 	b.message("Installing Packages", "count", len(pkgs), "dir", b.dir)
 	for _, pkg := range pkgs {
 		group.Go(func() error {
-			if err := b.stepPackageInstall(mirror, pdirs, &pkg); err != nil {
+			if err := b.installPackage(mirror, pdirs, &pkg); err != nil {
 				return err
 			}
 
@@ -159,7 +159,7 @@ func (b *bootstrapper) stepPackagesInstall(
 	return nil
 }
 
-func (b *bootstrapper) stepPackageInstall(
+func (b *bootstrapper) installPackage(
 	mirror *rbxbin.Mirror,
 	pdirs rbxbin.PackageDirectories,
 	pkg *rbxbin.Package,