1.0.10

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

config.go

@@ -20,8 +20,10 @@ type Config struct {
 }
 
 const (
-	configDirName = "epochcli"
+	configDirName    = "epochcli"
-	configName    = "config.toml"
+	configName       = "config.toml"
+	defaultWowPath   = "/path/to/wow"
+	defaultLaunchCmd = "not configured"
 )
 
 var (

main.go

@@ -1,27 +1,15 @@
 package main
 
 import (
-	"crypto/md5"
-	"encoding/hex"
 	"flag"
 	"fmt"
-	"io"
+	"git.burkey.co/eburk/epochcli/pkg/epoch"
-	"io/fs"
 	"log"
-	"net/http"
 	"os"
 	"os/exec"
-	"path/filepath"
-	"regexp"
 	"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 {
@@ -30,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)
 	}
 
@@ -61,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 {
@@ -102,115 +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
-	}
-
-	if config.RemoveUnknownPatches {
-		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(config.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
-}

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,151 @@
+package epoch
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"fmt"
+	"io"
+	"io/fs"
+	"net/http"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+)
+
+type UpdateStats struct {
+	Updated     int
+	Current     int
+	Outdated    int
+	LogMessages []string
+	Error       error
+}
+
+func Update(wowdir string, force bool, removeUnknown bool, skipDownload bool) UpdateStats {
+	stats := UpdateStats{
+		LogMessages: make([]string, 0),
+		Error:       nil,
+	}
+
+	manifest, err := GetManifest()
+	if err != nil {
+		stats.Error = fmt.Errorf("Failed to get manifest: %v\n", err)
+		return stats
+	}
+
+	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)
+				return stats
+			}
+		}
+
+		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)
+					return stats
+				}
+				hashBytes := md5.Sum(data)
+				hash := hex.EncodeToString(hashBytes[:])
+				if hash == file.Hash {
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("File %s is up to date", localPath))
+					stats.Current += 1
+					continue
+				} else {
+					stats.Outdated += 1
+				}
+			}
+		}
+
+		if !skipDownload {
+			outFile, err := os.Create(localPath)
+			if err != nil {
+				stats.Error = fmt.Errorf("failed to create file %s: %v", localPath, err)
+				return stats
+			}
+
+			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()
+					}
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("Failed to download %s: %v", url, err))
+					continue
+				}
+				if resp.StatusCode != http.StatusOK {
+					resp.Body.Close()
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("HTTP Status %d", resp.StatusCode))
+					continue
+				}
+
+				_, err = io.Copy(outFile, resp.Body)
+				if err != nil {
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("Failed to write file %s: %v", localPath, err))
+					resp.Body.Close()
+					continue
+				}
+
+				resp.Body.Close()
+				downloadSuccess = true
+				stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("Successfully downloaded %s", localPath))
+				break
+			}
+
+			outFile.Close()
+			if !downloadSuccess {
+				stats.Error = fmt.Errorf("Failed to download updates, see above messages")
+				return stats
+			}
+
+			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
+					}
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("Removed unknown patch %s", d.Name()))
+				}
+			}
+			return nil
+		})
+
+		if err != nil {
+			stats.Error = fmt.Errorf("failed to delete unknown patches: %v", err)
+		}
+	}
+
+	return stats
+}

version.go

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