1.0.9

README.md

@@ -38,6 +38,7 @@ Download and extract the latest binary from the [releases](https://git.burkey.co
 
 1. Run `epochcli`. You will be taken through a setup process that configures the program and creates a config file at `$HOME/.config/epochcli/config.toml`
 2. You can now use `epochcli` as a standalone updater, but it can also act as a launcher based on your configuration. You can always run `epochcli -c` to redo the configuration, or edit the config file manually
+3. By default, `epochcli` will delete any non-standard patches. This can be disabled by changing the configuration file's `RemoveUnknownPatches` value to `false`
 
 ## Usage
 ```

config.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"fmt"
 	"github.com/BurntSushi/toml"
 	"os"
@@ -11,18 +12,24 @@ import (
 )
 
 type Config struct {
-	WowDir         string
+	WowDir               string
-	LaunchCmd      string
+	LaunchCmd            string
-	WinePrefix     string
+	WinePrefix           string
-	EnableLauncher bool
+	EnableLauncher       bool
+	RemoveUnknownPatches bool
 }
 
 const (
-	configDirName = "epochcli"
+	configDirName    = "epochcli"
-	configName    = "config.toml"
+	configName       = "config.toml"
+	defaultWowPath   = "/path/to/wow"
+	defaultLaunchCmd = "not configured"
 )
 
-var cfgPath string
+var (
+	configRun = false
+	cfgPath   string
+)
 
 func setupConfig(rerun bool) (*Config, error) {
 	home, err := os.UserHomeDir()
@@ -32,20 +39,21 @@ func setupConfig(rerun bool) (*Config, error) {
 	cfgPath = filepath.Join(home, ".config", configDirName, configName)
 
 	newConfig := Config{
-		WowDir:         defaultWowPath,
+		WowDir:               defaultWowPath,
-		LaunchCmd:      defaultLaunchCmd,
+		LaunchCmd:            defaultLaunchCmd,
-		EnableLauncher: false,
+		EnableLauncher:       false,
+		RemoveUnknownPatches: true,
 	}
 
 	_, statErr := os.Stat(cfgPath)
 	if rerun || os.IsNotExist(statErr) {
+		configRun = true
 		fmt.Println("Enter the path to your Wow directory below. Use the full path without shortcuts like '~' (ex: /home/user/epoch):")
-		var s string
+		s, err := readLine()
-		_, err = fmt.Scanln(&s)
 		if err != nil {
 			return nil, fmt.Errorf("unable to read input: %v", err)
 		}
-		newConfig.WowDir = strings.TrimSpace(s)
+		newConfig.WowDir = s
 
 		fmt.Println()
 		p, err := promptYesNo(fmt.Sprintf("Do you want to use epochcli to launch Wow? Select No if you plan on using a launcher tool like Lutris (y/n): "))
@@ -81,7 +89,7 @@ func setupConfig(rerun bool) (*Config, error) {
 				if s == "" {
 					fmt.Printf("wine %s\n", newConfig.LaunchCmd)
 				} else {
-					fmt.Printf("WINEPREFIX=%s wine %s\n", newConfig.WinePrefix, newConfig.LaunchCmd)
+					fmt.Printf("WINEPREFIX=%s %s\n", newConfig.WinePrefix, newConfig.LaunchCmd)
 				}
 				fmt.Printf("Modify the configuration file at %s if you need to customize it\n\n", cfgPath)
 			}
@@ -94,14 +102,16 @@ func setupConfig(rerun bool) (*Config, error) {
 
 		file, err := os.Create(cfgPath)
 		if err != nil {
+			file.Close()
 			return nil, fmt.Errorf("unable to create config file: %v", err)
 		}
-		defer file.Close()
 
 		encoder := toml.NewEncoder(file)
 		if err = encoder.Encode(newConfig); err != nil {
+			file.Close()
 			return nil, fmt.Errorf("unable to encode config file: %v", err)
 		}
+		file.Close()
 
 		fmt.Printf("Created new config at %s\n\n", cfgPath)
 	}
@@ -111,18 +121,28 @@ func setupConfig(rerun bool) (*Config, error) {
 		return nil, err
 	}
 
+	// Rewrite config file with any new defaults
+	file, err := os.Create(cfgPath)
+	if err != nil {
+		return nil, fmt.Errorf("unable to config file: %v", err)
+	}
+	defer file.Close()
+
+	encoder := toml.NewEncoder(file)
+	if err = encoder.Encode(newConfig); err != nil {
+		return nil, fmt.Errorf("unable to encode config file: %v", err)
+	}
+
 	return &newConfig, nil
 }
 
 func promptYesNo(prompt string) (bool, error) {
-	var s string
 	for {
 		fmt.Print(prompt)
-		_, err := fmt.Scanf("%s", &s)
+		s, err := readLine()
 		if err != nil {
 			return false, fmt.Errorf("unable to read input: %v", err)
 		}
-		s := strings.TrimSpace(s)
 
 		if s == "y" || s == "Y" {
 			return true, nil
@@ -139,10 +159,18 @@ func input(prompt string) (string, error) {
 	fmt.Println(prompt)
 	fmt.Printf("> ")
 
-	var s string
+	s, err := readLine()
-	_, err := fmt.Scanf("%s", &s)
 	if err != nil {
 		return "", fmt.Errorf("unable to read input: %v", err)
 	}
-	return strings.TrimSpace(s), nil
+	return s, nil
+}
+
+func readLine() (string, error) {
+	reader := bufio.NewReader(os.Stdin)
+	in, err := reader.ReadString('\n')
+	if err != nil {
+		return "", fmt.Errorf("unable to read input: %v", err)
+	}
+	return strings.TrimSpace(in), nil
 }

main.go

@@ -1,26 +1,15 @@
 package main
 
 import (
-	"crypto/md5"
-	"encoding/hex"
 	"flag"
 	"fmt"
-	"io"
+	"git.burkey.co/eburk/epochcli/pkg/epoch"
 	"log"
-	"net/http"
 	"os"
 	"os/exec"
-	"path/filepath"
-	"runtime"
 	"strings"
 )
 
-const (
-	manifestUrl      = "https://updater.project-epoch.net/api/v2/manifest"
-	defaultWowPath   = "/path/to/wow"
-	defaultLaunchCmd = "not configured"
-)
-
 func main() {
 	outOfDate, err := needUpdate()
 	if err != nil {
@@ -60,14 +49,19 @@ func main() {
 		log.Fatalf("WowDir in %s is still the default setting, exiting", cfgPath)
 	}
 
-	stats, err := downloadUpdate(config, forceFlag)
+	stats, err := epoch.DownloadUpdate(config.WowDir, forceFlag, config.RemoveUnknownPatches)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	fmt.Printf("%d files updated\n\n", stats.updated)
+	fmt.Printf("%d files updated\n\n", stats.Updated)
-	if stats.current > 0 {
+	if stats.Current > 0 {
-		fmt.Printf("%d files are already up to date\n\n", stats.current)
+		fmt.Printf("%d files are already up to date\n\n", stats.Current)
+	}
+
+	if configRun {
+		fmt.Println("Configuration complete!")
+		os.Exit(0)
 	}
 
 	if updateOnlyFlag {
@@ -81,9 +75,6 @@ func main() {
 
 		fmt.Println("Starting Epoch...")
 		var cmd = strings.Split(config.LaunchCmd, " ")
-		if runtime.GOOS == "darwin" {
-			cmd = append([]string{"open"}, cmd...)
-		}
 		ex := exec.Command(cmd[0], cmd[1:]...)
 		cmdStr := strings.Join(cmd, " ")
 		if config.WinePrefix != "" {
@@ -99,80 +90,3 @@ func main() {
 		}
 	}
 }
-
-type DownloadStats struct {
-	updated int
-	current int
-}
-
-func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
-	var stats DownloadStats
-
-	manifest, err := getManifest()
-	if err != nil {
-		log.Fatalf("Failed to get manifest: %v\n", err)
-	}
-
-	for _, file := range manifest.Files {
-		path := strings.ReplaceAll(file.Path, `\`, `/`)
-		path = strings.TrimLeft(path, `\`)
-
-		localPath := filepath.Join(config.WowDir, path)
-		localDir := filepath.Dir(localPath)
-		if _, err = os.Stat(localDir); os.IsNotExist(err) {
-			err = os.MkdirAll(localDir, 0755)
-			if err != nil {
-				return stats, fmt.Errorf("failed to create directory %s: %v", localDir, err)
-			}
-		}
-
-		if !force {
-			if _, err = os.Stat(localPath); err == nil {
-				data, err := os.ReadFile(localPath)
-				if err != nil {
-					return stats, err
-				}
-				hashBytes := md5.Sum(data)
-				hash := hex.EncodeToString(hashBytes[:])
-				if hash == file.Hash {
-					fmt.Printf("File %s is up to date\n", localPath)
-					stats.current += 1
-					continue
-				}
-			}
-		}
-
-		fmt.Printf("Updating %s...\n", localPath)
-
-		outFile, err := os.Create(localPath)
-		if err != nil {
-			return stats, err
-		}
-
-		for _, url := range []string{file.Urls.Cloudflare, file.Urls.Digitalocean, file.Urls.None} {
-			resp, err := http.Get(url)
-			if err != nil {
-				outFile.Close()
-				return stats, err
-			}
-			defer resp.Body.Close()
-			if resp.StatusCode != http.StatusOK {
-				outFile.Close()
-				return stats, fmt.Errorf("failed to download update from %s, status code: %d", url, resp.StatusCode)
-			}
-
-			_, err = io.Copy(outFile, resp.Body)
-			if err != nil {
-				outFile.Close()
-				return stats, err
-			}
-
-			break
-		}
-
-		outFile.Close()
-		stats.updated += 1
-	}
-
-	return stats, nil
-}

pkg/epoch/manifest.go

@@ -1,4 +1,4 @@
-package main
+package epoch
 
 import (
 	"encoding/json"
@@ -6,6 +6,10 @@ import (
 	"net/http"
 )
 
+const (
+	manifestUrl = "https://updater.project-epoch.net/api/v2/manifest"
+)
+
 type File struct {
 	Path   string `json:"Path"`
 	Hash   string `json:"Hash"`
@@ -25,7 +29,7 @@ type Manifest struct {
 	CheckedAt string `json:"checked_at"`
 }
 
-func getManifest() (*Manifest, error) {
+func GetManifest() (*Manifest, error) {
 	resp, err := http.Get(manifestUrl)
 	if err != nil {
 		return nil, err

pkg/epoch/update.go

@@ -0,0 +1,127 @@
+package epoch
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/fs"
+	"log"
+	"net/http"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+type DownloadStats struct {
+	Updated int
+	Current int
+}
+
+func DownloadUpdate(wowdir string, force bool, removeUnknown bool) (DownloadStats, error) {
+	var stats DownloadStats
+
+	manifest, err := GetManifest()
+	if err != nil {
+		log.Fatalf("Failed to get manifest: %v\n", err)
+	}
+
+	for _, file := range manifest.Files {
+		path := strings.ReplaceAll(file.Path, `\`, `/`)
+		path = strings.TrimLeft(path, `\`)
+
+		localPath := filepath.Join(wowdir, path)
+		localDir := filepath.Dir(localPath)
+		if _, err = os.Stat(localDir); os.IsNotExist(err) {
+			err = os.MkdirAll(localDir, 0755)
+			if err != nil {
+				return stats, fmt.Errorf("failed to create directory %s: %v", localDir, err)
+			}
+		}
+
+		if !force {
+			if _, err = os.Stat(localPath); err == nil {
+				data, err := os.ReadFile(localPath)
+				if err != nil {
+					return stats, err
+				}
+				hashBytes := md5.Sum(data)
+				hash := hex.EncodeToString(hashBytes[:])
+				if hash == file.Hash {
+					fmt.Printf("File %s is up to date\n", localPath)
+					stats.Current += 1
+					continue
+				}
+			}
+		}
+
+		fmt.Printf("Updating %s...\n", localPath)
+
+		outFile, err := os.Create(localPath)
+		if err != nil {
+			return stats, err
+		}
+
+		for _, url := range []string{file.Urls.Cloudflare, file.Urls.Digitalocean, file.Urls.None} {
+			resp, err := http.Get(url)
+			if err != nil {
+				outFile.Close()
+				return stats, err
+			}
+			defer resp.Body.Close()
+			if resp.StatusCode != http.StatusOK {
+				outFile.Close()
+				return stats, fmt.Errorf("failed to download update from %s, status code: %d", url, resp.StatusCode)
+			}
+
+			_, err = io.Copy(outFile, resp.Body)
+			if err != nil {
+				outFile.Close()
+				return stats, err
+			}
+
+			break
+		}
+
+		outFile.Close()
+		stats.Updated += 1
+	}
+
+	if removeUnknown {
+		patches := make([]string, 0)
+		patchreg := regexp.MustCompile(`patch-[A-Za-z].MPQ`)
+
+		for _, file := range manifest.Files {
+			if patchreg.MatchString(file.Path) {
+				patches = append(patches, strings.Split(file.Path, "Data\\")[1])
+			}
+		}
+
+		err = filepath.WalkDir(filepath.Join(wowdir, "Data"), func(path string, d fs.DirEntry, err error) error {
+			if !d.IsDir() && patchreg.MatchString(d.Name()) {
+				del := true
+				for _, patch := range patches {
+					if patch == d.Name() {
+						del = false
+						break
+					}
+				}
+				if del {
+					err = os.Remove(path)
+					if err != nil {
+						return err
+					}
+					fmt.Println("Removed unknown patch", d.Name())
+				}
+			}
+			return nil
+		})
+
+		if err != nil {
+			log.Fatalf("failed to delete unknown patches: %s", err)
+		}
+	}
+
+	return stats, nil
+}

version.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 )
 
-const version = "1.0.6"
+const version = "1.0.9"
 const versionUrl = "https://git.burkey.co/eburk/epochcli/raw/branch/master/version.go"
 
 func needUpdate() (bool, error) {