refactor: extract TempPath and BinPath funcs

Author: matteosuppo

main.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/arduino/arduino-create-agent/systray"
 	"github.com/arduino/arduino-create-agent/tools"
+	"github.com/arduino/arduino-create-agent/updater"
 	"github.com/arduino/arduino-create-agent/utilities"
 	v2 "github.com/arduino/arduino-create-agent/v2"
 	"github.com/gin-gonic/gin"
@@ -130,22 +131,15 @@ func main() {
 
 	// If the executable is temporary, copy it to the full path, then restart
 	if strings.Contains(path, "-temp") {
-		correctPath := strings.Replace(path, "-temp", "", -1)
-		err := copyExe(path, correctPath)
+		err := copyExe(path, updater.BinPath(path))
 		if err != nil {
 			panic(err)
 		}
 
 		Systray.Restart()
 	} else {
 		// Otherwise copy to a path with -temp suffix
-		correctPath := path
-		if filepath.Ext(path) == "exe" {
-			path = strings.Replace(path, ".exe", "-temp.exe", -1)
-		} else {
-			path = path + "-temp"
-		}
-		err := copyExe(path, correctPath)
+		err := copyExe(path, updater.TempPath(path))
 		if err != nil {
 			panic(err)
 		}

update.go

@@ -30,9 +30,6 @@
 package main
 
 import (
-	"path/filepath"
-	"strings"
-
 	"github.com/arduino/arduino-create-agent/updater"
 	"github.com/gin-gonic/gin"
 	"github.com/kardianos/osext"
@@ -63,11 +60,7 @@ func updateHandler(c *gin.Context) {
 		return
 	}
 
-	if filepath.Ext(path) == "exe" {
-		path = strings.Replace(path, ".exe", "-temp.exe", -1)
-	} else {
-		path = path + "-temp"
-	}
+	path = updater.TempPath(path)
 
 	c.JSON(200, gin.H{"success": "Please wait a moment while the agent reboots itself"})
 	Systray.Update(path)

updater/updater.go

@@ -57,6 +57,22 @@ const devValidTime = 7 * 24 * time.Hour
 var errHashMismatch = errors.New("new file hash mismatch after patch")
 var up = update.New()
 
+// TempPath generates a temporary path for the executable
+func TempPath(path string) string {
+	if filepath.Ext(path) == "exe" {
+		path = strings.Replace(path, ".exe", "-temp.exe", -1)
+	} else {
+		path = path + "-temp"
+	}
+
+	return path
+}
+
+// TempPath generates the proper path for a temporary executable
+func BinPath(path string) string {
+	return strings.Replace(path, "-temp", "", -1)
+}
+
 // Updater is the configuration and runtime data for doing an update.
 //
 // Note that ApiURL, BinURL and DiffURL should have the same value if all files are available at the same location.
@@ -203,11 +219,8 @@ func (u *Updater) update() error {
 	if err != nil {
 		return err
 	}
-	if filepath.Ext(path) == "exe" {
-		path = strings.Replace(path, ".exe", "-temp.exe", -1)
-	} else {
-		path = path + "-temp"
-	}
+
+	path = TempPath(path)
 
 	old, err := os.Open(path)
 	if err != nil {