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

main.go

@@ -18,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)
 	}
 
@@ -49,8 +52,8 @@ func main() {
 		log.Fatalf("WowDir in %s is still the default setting, exiting", cfgPath)
 	}
 
-	stats, err := epoch.DownloadUpdate(config.WowDir, forceFlag, config.RemoveUnknownPatches)
-	if err != nil {
+	stats := epoch.Update(config.WowDir, forceFlag, config.RemoveUnknownPatches, false)
+	if stats.Error != nil {
 		log.Fatal(err)
 	}
 

pkg/epoch/update.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -14,17 +13,24 @@ import (
 	"strings"
 )
 
-type DownloadStats struct {
-	Updated int
-	Current int
+type UpdateStats struct {
+	Updated     int
+	Current     int
+	Outdated    int
+	LogMessages []string
+	Error       error
 }
 
-func DownloadUpdate(wowdir string, force bool, removeUnknown bool) (DownloadStats, error) {
-	var stats DownloadStats
+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 {
-		log.Fatalf("Failed to get manifest: %v\n", err)
+		stats.Error = fmt.Errorf("Failed to get manifest: %v\n", err)
+		return stats
 	}
 
 	for _, file := range manifest.Files {
@@ -36,7 +42,8 @@ func DownloadUpdate(wowdir string, force bool, removeUnknown bool) (DownloadStat
 		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)
+				stats.Error = fmt.Errorf("failed to create directory %s: %v", localDir, err)
+				return stats
 			}
 		}
 
@@ -44,48 +51,65 @@ func DownloadUpdate(wowdir string, force bool, removeUnknown bool) (DownloadStat
 			if _, err = os.Stat(localPath); err == nil {
 				data, err := os.ReadFile(localPath)
 				if err != nil {
-					return stats, err
+					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 {
-					fmt.Printf("File %s is up to date\n", localPath)
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("File %s is up to date", localPath))
 					stats.Current += 1
 					continue
+				} else {
+					stats.Outdated += 1
 				}
 			}
 		}
 
-		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 !skipDownload {
+			outFile, err := os.Create(localPath)
 			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)
+				stats.Error = fmt.Errorf("failed to create file %s: %v", localPath, err)
+				return stats
 			}
 
-			_, err = io.Copy(outFile, resp.Body)
-			if err != nil {
-				outFile.Close()
-				return stats, err
+			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
 			}
 
-			break
+			outFile.Close()
+			if !downloadSuccess {
+				stats.Error = fmt.Errorf("Failed to download updates, see above messages")
+				return stats
+			}
+
+			stats.Updated += 1
 		}
-
-		outFile.Close()
-		stats.Updated += 1
 	}
 
 	if removeUnknown {
@@ -112,16 +136,16 @@ func DownloadUpdate(wowdir string, force bool, removeUnknown bool) (DownloadStat
 					if err != nil {
 						return err
 					}
-					fmt.Println("Removed unknown patch", d.Name())
+					stats.LogMessages = append(stats.LogMessages, fmt.Sprintf("Removed unknown patch %s", d.Name()))
 				}
 			}
 			return nil
 		})
 
 		if err != nil {
-			log.Fatalf("failed to delete unknown patches: %s", err)
+			stats.Error = fmt.Errorf("failed to delete unknown patches: %v", err)
 		}
 	}
 
-	return stats, nil
+	return stats
 }

version.go

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