1.1.2

README.md

@@ -2,6 +2,8 @@
 
 CLI tool for updating and launching [Project Epoch](https://www.project-epoch.net/) on Windows, Linux and macOS.
 
+If you're a Linux newbie or just looking for a simpler one-click solution, check out [this excellent Lutris script](https://lutris.net/games/project-epoch/) by another community member
+
 ## Installing
 
 ### Linux
@@ -16,9 +18,9 @@ A tutorial for the full setup of Epoch on Arch Linux [can be found here](https:/
 
 ### macOS
 
-For macOS, I've found the best way to run Wow is in a Parallels Win 11 VM. Kegworks, Codeweavers, etc crash when the game starts up and I have not found a good solution so far. Any suggestions would be welcome, see my contact information below. I currently use a Parallels VM and run the Windows version of epochcli inside the VM as an updater and launcher.
+For arm64 macOS (aka M1, M2 etc), I have built an app that handles all of Epoch's setup for you. [Go check it out](https://git.burkey.co/eburk/EpochSilicon)
 
-You can easily install with homebrew or build from source yourself. I dont have time to setup codesigning right now so there are no binaries provided for macOS. For homebrew, do the following:
+Alternatively, you can easily install with homebrew or build from source yourself. I dont have time to setup codesigning right now so there are no binaries provided for macOS. For homebrew, do the following:
 
 ```shell
 brew tap eburk/epochcli https://git.burkey.co/eburk/epochcli
@@ -38,6 +40,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

@@ -12,15 +12,18 @@ 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 (
@@ -36,9 +39,10 @@ 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)
@@ -98,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)
 	}
@@ -115,6 +121,18 @@ 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
 }
 

go.mod

@@ -4,6 +4,7 @@ go 1.24.3
 
 require (
 	github.com/BurntSushi/toml v1.5.0
+	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/go-ole/go-ole v1.3.0
 )
 

go.sum

@@ -1,5 +1,7 @@
 github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
+github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=

main.go

@@ -1,25 +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"
 	"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 {
@@ -28,6 +18,9 @@ func main() {
 
 	if outOfDate {
 		fmt.Println("There is a new version of epochcli, you must update before running")
+		fmt.Println("Press any key to exit...")
+		var c rune
+		fmt.Scanf("%c", &c)
 		os.Exit(1)
 	}
 
@@ -59,14 +52,14 @@ func main() {
 		log.Fatalf("WowDir in %s is still the default setting, exiting", cfgPath)
 	}
 
-	stats, err := downloadUpdate(config, forceFlag)
+	stats := epoch.Update(config.WowDir, forceFlag, config.RemoveUnknownPatches, false)
-	if err != nil {
+	if stats.Error != 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 {
@@ -100,80 +93,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,168 @@
+package epoch
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/fs"
+	"net/http"
+	"os"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strings"
+)
+
+type UpdateStats struct {
+	Updated    int
+	Current    int
+	Outdated   int
+	Error      error
+	MessageBuf []string
+}
+
+func Update(wowdir string, force bool, removeUnknown bool, skipDownload bool) UpdateStats {
+	stats := UpdateStats{
+		Error:      nil,
+		MessageBuf: make([]string, 0),
+	}
+
+	msgChan := make(chan string)
+	done := make(chan bool)
+
+	go func() {
+		manifest, err := GetManifest()
+		if err != nil {
+			stats.Error = fmt.Errorf("Failed to get manifest: %v\n", err)
+			done <- true
+			return
+		}
+
+		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 {
+					stats.Error = fmt.Errorf("failed to create directory %s: %v", localDir, err)
+					done <- true
+					return
+				}
+			}
+
+			if !force {
+				if _, err = os.Stat(localPath); err == nil {
+					data, err := os.ReadFile(localPath)
+					if err != nil {
+						stats.Error = fmt.Errorf("failed to read %s: %v", localPath, err)
+						done <- true
+						return
+					}
+					hashBytes := md5.Sum(data)
+					hash := hex.EncodeToString(hashBytes[:])
+					if hash == file.Hash {
+						msgChan <- fmt.Sprintf("File %s is up to date", localPath)
+						stats.Current += 1
+						continue
+					} else {
+						stats.Outdated += 1
+					}
+				}
+			}
+
+			if !skipDownload {
+				msgChan <- fmt.Sprintf("Downloading %s", localPath)
+				outFile, err := os.Create(localPath)
+				if err != nil {
+					stats.Error = fmt.Errorf("failed to create file %s: %v", localPath, err)
+					done <- true
+					return
+				}
+
+				downloadSuccess := false
+				for _, url := range []string{file.Urls.Cloudflare, file.Urls.Digitalocean, file.Urls.None} {
+					resp, err := http.Get(url)
+					if err != nil {
+						if resp != nil {
+							resp.Body.Close()
+						}
+						msgChan <- fmt.Sprintf("Failed to download %s: %v", url, err)
+						continue
+					}
+					if resp.StatusCode != http.StatusOK {
+						resp.Body.Close()
+						msgChan <- fmt.Sprintf("HTTP Status %d", resp.StatusCode)
+						continue
+					}
+
+					_, err = io.Copy(outFile, resp.Body)
+					if err != nil {
+						msgChan <- fmt.Sprintf("Failed to write file %s: %v", localPath, err)
+						resp.Body.Close()
+						continue
+					}
+
+					resp.Body.Close()
+					downloadSuccess = true
+					msgChan <- fmt.Sprintf("Successfully downloaded %s", localPath)
+					break
+				}
+
+				outFile.Close()
+				if !downloadSuccess {
+					stats.Error = fmt.Errorf("Failed to download updates, see above messages")
+					done <- true
+					return
+				}
+
+				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
+					if slices.Contains(patches, d.Name()) {
+						del = false
+					}
+					if del {
+						err = os.Remove(path)
+						if err != nil {
+							return err
+						}
+						msgChan <- fmt.Sprintf("Removed unknown patch %s", d.Name())
+					}
+				}
+				return nil
+			})
+			if err != nil {
+				stats.Error = fmt.Errorf("failed to delete unknown patches: %v", err)
+			}
+		}
+		done <- true
+	}()
+
+	for {
+		select {
+		case msg := <-msgChan:
+			fmt.Println(msg)
+			stats.MessageBuf = append(stats.MessageBuf, msg)
+		case <-done:
+			return stats
+		}
+	}
+}

version.go

@@ -5,10 +5,14 @@ import (
 	"io"
 	"net/http"
 	"regexp"
+
+	"github.com/Masterminds/semver/v3"
 )
 
-const version = "1.0.7"
+const (
-const versionUrl = "https://git.burkey.co/eburk/epochcli/raw/branch/master/version.go"
+	version    = "1.1.2"
+	versionUrl = "https://git.burkey.co/eburk/epochcli/raw/branch/master/version.go"
+)
 
 func needUpdate() (bool, error) {
 	resp, err := http.Get(versionUrl)
@@ -26,11 +30,26 @@ func needUpdate() (bool, error) {
 		return false, fmt.Errorf("unable to read response body: %v", err)
 	}
 
-	re := regexp.MustCompile(`const version = "([\d.]+)"`)
+	re := regexp.MustCompile(`version\s+=\s+"(\d+.\d+.\d+)"`)
 	ver := re.FindStringSubmatch(string(b))
-	if len(ver) < 2 || ver[1] == "" {
+	if ver[1] == "" {
-		return false, fmt.Errorf("unable to find version in response")
+		return false, fmt.Errorf("unable to parse version number")
 	}
 
-	return ver[1] != version, nil
+	curVer, err := semver.NewVersion(version)
+	if err != nil {
+		return false, fmt.Errorf("unable to parse current version to semver: %v", err)
+	}
+
+	newVer, err := semver.NewVersion(ver[1])
+	if err != nil {
+		return false, fmt.Errorf("unable to parse new version to semver: %v", err)
+	}
+
+	if curVer.LessThan(newVer) {
+		fmt.Println("Current Version: ", curVer)
+		fmt.Println("Latest Version: ", newVer)
+		return true, nil
+	}
+	return false, nil
 }