upgraded config creation

.gitignore

@@ -1,5 +1,4 @@
 .idea
 bin/
 epochcli-*
-epochcli
 *.tar.gz

Formula/epochcli.rb

@@ -1,18 +0,0 @@
-class Epochcli < Formula
-  desc "Updater and Launcher for Epoch"
-  homepage "https://git.burkey.co/eburk/epochcli/src/branch/master"
-  url "https://git.burkey.co/eburk/epochcli/archive/0.0.2.tar.gz"
-  sha256 "192ae687256a33468e97c7116177b65fb42b42a66138f61f24b93b76f4048f1c"
-  license "ISC"
-  head "https://git.burkey.co/eburk/epochcli.git", branch: "master"
-
-  depends_on "go" => :build
-
-  def install
-    system "go", "build", *std_go_args(ldflags: "-s -w")
-  end
-
-  test do
-    assert_match "Epochcli Help:", shell_output("#{bin}/epochcli -h")
-  end
-end

README.md

@@ -2,12 +2,15 @@
 
 CLI tool for updating and launching [Project Epoch](https://www.project-epoch.net/) on Linux & macOS.
 
-## Setup
+## Setup Instructions
-For Linux, a `wine` prefix with `dxvk` installed is sufficient, or you can use something like Lutris or faugus-launcher without the launcher functionality in `epochcli`.
+For Linux, a `wine` prefix with `dxvk` installed is sufficient, or you can use something like Lutris or faugus-launcher without the launcher functionality in `epochcli`
 
-For macOS, I've found the best way to run the client 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.
+For macOS, the [Kegworks Wineskin port](https://github.com/Kegworks-App/Kegworks) works great (tutorial coming in the future...)
 
-1. Download and extract the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page. 
+1. Install `epochcli` by either
+   1. Downloading the latest binary from the [releases](https://git.burkey.co/eburk/epochcli/releases) page 
+   2. If you have the `go` toolchain installed, you can run `go install git.burkey.co/eburk/epochcli` to install to your `$GOROOT`
+   3. Compile the source yourself
 2. 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`
 3. You can now use `epochcli` as just a standalone updater or also a launcher based on your configuration. You can always run `epochcli -c` to redo the configuration or edit the config file manually
 
@@ -15,7 +18,6 @@ For macOS, I've found the best way to run the client is in a Parallels Win 11 VM
 ```
 > ./epochcli -h
   -c    Runs config configuration step. Overrides the config file
-  -f    Forces epochcli to update files even if they match the current version
   -h    Print help
   -u    Ignore EnableLauncher setting in config and only runs an update. Does nothing if EnableLauncher is false
 ```

config.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"github.com/BurntSushi/toml"
+	"github.com/sqweek/dialog"
 	"os"
 	"path/filepath"
 )
@@ -36,16 +38,23 @@ func setupConfig(rerun bool) (*Config, error) {
 
 	_, statErr := os.Stat(cfgPath)
 	if rerun || os.IsNotExist(statErr) {
-		fmt.Println("Enter the path to your Wow directory below:")
+		fmt.Println("Press any key to open a file window and select your wow directory")
-		_, err := fmt.Scanln(&newConfig.WowDir)
+		var r rune
+		_, _ = fmt.Scanf("%c", &r)
+
+		var err error
+		newConfig.WowDir, err = dialog.Directory().Title("Select your wow directory").Browse()
 		if err != nil {
+			if errors.Is(err, dialog.ErrCancelled) {
+				return nil, fmt.Errorf("cancelled dialog box, exiting")
+			}
 			return nil, err
 		}
 
 		for {
 			fmt.Printf("Do you want to use epochcli to launch Wow? Select No if you plan on using a launcher tool like Lutris (y/n): ")
 			var s string
-			_, err := fmt.Scanf("%s", &s)
+			_, err = fmt.Scanf("%s", &s)
 			if err != nil {
 				return nil, err
 			}

go.mod

@@ -2,4 +2,9 @@ module git.burkey.co/eburk/epochcli
 
 go 1.24.3
 
-require github.com/BurntSushi/toml v1.5.0
+require (
+	github.com/BurntSushi/toml v1.5.0
+	github.com/sqweek/dialog v0.0.0-20240226140203-065105509627
+)
+
+require github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect

go.sum

@@ -1,2 +1,6 @@
 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/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2jiKyS17BH6IrTmUBYqZa/CXT4uvb+I=
+github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
+github.com/sqweek/dialog v0.0.0-20240226140203-065105509627 h1:2JL2wmHXWIAxDofCK+AdkFi1KEg3dgkefCsm7isADzQ=
+github.com/sqweek/dialog v0.0.0-20240226140203-065105509627/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw=

main.go

@@ -25,18 +25,15 @@ func main() {
 	var (
 		helpFlag       bool
 		updateOnlyFlag bool
-		forceFlag      bool
 		rerunConfig    bool
 	)
 	flag.BoolVar(&helpFlag, "h", false, "Print help")
-	flag.BoolVar(&forceFlag, "f", false, "Forces epochcli to update files even if they match the current version")
 	flag.BoolVar(&updateOnlyFlag, "u", false, "Ignore EnableLauncher setting in config and only runs an update. Does nothing if EnableLauncher is false")
 	flag.BoolVar(&rerunConfig, "c", false, "Runs config configuration step. Overrides the config file")
 	flag.Parse()
 
 	if helpFlag {
 		flag.CommandLine.SetOutput(os.Stdout)
-		fmt.Println("Epochcli Help:")
 		flag.PrintDefaults()
 		os.Exit(0)
 	}
@@ -50,14 +47,14 @@ func main() {
 		log.Fatalf("WowDir in %s is still the default setting, exiting", cfgPath)
 	}
 
-	stats, err := downloadUpdate(config, forceFlag)
+	updated, current, err := downloadUpdate(config)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	fmt.Printf("%d files updated\n", stats.updated)
+	fmt.Printf("Updated %d files\n", updated)
-	if stats.current > 0 {
+	if current > 0 {
-		fmt.Printf("%d files are already up to date\n", stats.current)
+		fmt.Printf("%d files are already up to date\n", current)
 	}
 
 	if updateOnlyFlag {
@@ -79,13 +76,8 @@ func main() {
 	}
 }
 
-type DownloadStats struct {
+func downloadUpdate(config *Config) (int, int, error) {
-	updated int
+	var updateCount, currentCount int
-	current int
-}
-
-func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
-	var stats DownloadStats
 
 	manifest, err := getManifest()
 	if err != nil {
@@ -102,46 +94,43 @@ func downloadUpdate(config *Config, force bool) (DownloadStats, error) {
 			os.MkdirAll(localDir, 0755)
 		}
 
-		if !force {
+		if _, err = os.Stat(localPath); err == nil {
-			if _, err = os.Stat(localPath); err == nil {
+			data, err := os.ReadFile(localPath)
-				data, err := os.ReadFile(localPath)
+			if err != nil {
-				if err != nil {
+				return updateCount, currentCount, err
-					return stats, err
+			}
-				}
+			hashBytes := md5.Sum(data)
-				hashBytes := md5.Sum(data)
+			hash := hex.EncodeToString(hashBytes[:])
-				hash := hex.EncodeToString(hashBytes[:])
+			if hash == file.Hash {
-				if hash == file.Hash {
+				currentCount += 1
-					fmt.Printf("File %s is up to date\n", localPath)
+				continue
-					stats.current += 1
-					continue
-				}
 			}
 		}
 
-		fmt.Printf(" %s...\n", localPath)
+		fmt.Printf("Updating %s...\n", file.Path)
 
 		outFile, err := os.Create(localPath)
 		if err != nil {
-			return stats, err
+			return updateCount, currentCount, err
 		}
 		defer outFile.Close()
 
 		resp, err := http.Get(file.URL)
 		if err != nil {
-			return stats, err
+			return updateCount, currentCount, err
 		}
 		defer resp.Body.Close()
 		if resp.StatusCode != http.StatusOK {
-			return stats, fmt.Errorf("failed to download update from %s, status code: %d", file.URL, resp.StatusCode)
+			return updateCount, currentCount, fmt.Errorf("failed to download update from %s, status code: %d", file.URL, resp.StatusCode)
 		}
 
 		_, err = io.Copy(outFile, resp.Body)
 		if err != nil {
-			return stats, err
+			return updateCount, currentCount, err
 		}
 
-		stats.updated += 1
+		updateCount += 1
 	}
 
-	return stats, nil
+	return updateCount, currentCount, nil
 }

release.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 set -e
 
@@ -10,13 +10,10 @@ mkdir bin
 GOOS=linux GOARCH=amd64 go build -o bin/epochcli-linux-amd64
 tar czvf epochcli-linux-amd64.tar.gz bin/epochcli-linux-amd64
 
-GOOS=linux GOARCH=arm64 go build -o bin/epochcli-linux-arm64
+GOOS=darwin GOARCH=amd64 go build -o bin/epochcli-darwin-amd64
-tar czvf epochcli-linux-arm64.tar.gz bin/epochcli-linux-arm64
+tar czvf epochcli-darwin-amd64.tar.gz bin/epochcli-darwin-amd64
 
 GOOS=darwin GOARCH=arm64 go build -o bin/epochcli-darwin-arm64
 tar czvf epochcli-darwin-arm64.tar.gz bin/epochcli-darwin-arm64
 
-GOOS=darwin GOARCH=amd64 go build -o bin/epochcli-darwin-amd64
-tar czvf epochcli-darwin-amd64.tar.gz bin/epochcli-darwin-amd64
-
 rm -rf bin