diff --git a/FyneApp.toml b/FyneApp.toml index 0a72c3d..e6a593a 100644 --- a/FyneApp.toml +++ b/FyneApp.toml @@ -3,4 +3,4 @@ Name = "EpochSilicon" ID = "com.burkey.epochsilicon" Version = "1.0.0" - Build = 4 + Build = 9 diff --git a/go.mod b/go.mod index 334edaf..a5b08b3 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.24.5 require ( fyne.io/fyne/v2 v2.6.1 - git.burkey.co/eburk/epochcli v0.0.0-20250724134158-4d47056e5b16 + git.burkey.co/eburk/epochcli v0.0.0-20250724135717-365171fddc6b github.com/rs/zerolog v1.34.0 github.com/zalando/go-keyring v0.2.6 howett.net/plist v1.0.1 diff --git a/go.sum b/go.sum index 60e88e8..e77ad1e 100644 --- a/go.sum +++ b/go.sum @@ -16,6 +16,8 @@ git.burkey.co/eburk/epochcli v0.0.0-20250723150949-7f454dc63253 h1:g/+ztvoMIJD80 git.burkey.co/eburk/epochcli v0.0.0-20250723150949-7f454dc63253/go.mod h1:DgybCn9/LpJwvkrsyea9N2nWy/wuDgo6jkpOWYkTH3c= git.burkey.co/eburk/epochcli v0.0.0-20250724134158-4d47056e5b16 h1:L67RkxnNIpCoqy7dpN4XdPdNxQEFwA0/B2gisvUwNow= git.burkey.co/eburk/epochcli v0.0.0-20250724134158-4d47056e5b16/go.mod h1:DgybCn9/LpJwvkrsyea9N2nWy/wuDgo6jkpOWYkTH3c= +git.burkey.co/eburk/epochcli v0.0.0-20250724135717-365171fddc6b h1:fPDSiwJI3PzaU5utiurrnpNIv6IYj+CcUmwCzVcunsU= +git.burkey.co/eburk/epochcli v0.0.0-20250724135717-365171fddc6b/go.mod h1:DgybCn9/LpJwvkrsyea9N2nWy/wuDgo6jkpOWYkTH3c= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= diff --git a/pkg/launcher/launcher.go b/pkg/launcher/launcher.go index a2ed4bc..22a1ef3 100644 --- a/pkg/launcher/launcher.go +++ b/pkg/launcher/launcher.go @@ -16,10 +16,9 @@ import ( "fyne.io/fyne/v2/dialog" ) -var EnableMetalHud = false // Default to disabled -var CustomEnvVars = "" // Custom environment variables -var EnableVanillaTweaks = false // Default to disabled -var AutoDeleteWdb = false // Default to disabled +var EnableMetalHud = false // Default to disabled +var CustomEnvVars = "" // Custom environment variables +var AutoDeleteWdb = false // Default to disabled // Terminal state management var ( diff --git a/pkg/log/logging.go b/pkg/log/logging.go index fa2b491..78da6e4 100644 --- a/pkg/log/logging.go +++ b/pkg/log/logging.go @@ -16,7 +16,7 @@ var ( func SetupLogging() { logFilePointer = nil - ToConsole(zerolog.InfoLevel) + ToConsole(zerolog.DebugLevel) } func Close() { @@ -33,7 +33,8 @@ func ToFile(level zerolog.Level) { logger.Error().Msg(err.Error()) return } - logger = zerolog.New(logFilePointer).With().Timestamp().Logger().Level(level) + multi := zerolog.MultiLevelWriter(logFilePointer, os.Stdout) + logger = zerolog.New(multi).With().Timestamp().Logger().Level(level) } func ToConsole(level zerolog.Level) { diff --git a/pkg/patching/patching.go b/pkg/patching/patching.go index 777c8c7..54f8dae 100644 --- a/pkg/patching/patching.go +++ b/pkg/patching/patching.go @@ -204,8 +204,8 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) { // TODO: Change from dialog to pulsing animation dialog.ShowInformation("Downloading patches", "Downloading patches for Project Epoch, this will take some time. Please wait until the status changes to \"Patched\"", myWindow) paths.DownloadingPatches = true + log.Debug("Attempting to download Epoch patches...") go func() { - log.Debug("Attempting to download patches...") stats := epoch.Update(paths.EpochPath, true, true, false) if stats.Error != nil { errMsg := fmt.Sprintf("failed to update Epoch files: %v", stats.Error) diff --git a/pkg/ui/status.go b/pkg/ui/status.go index ae4bc47..d839d85 100644 --- a/pkg/ui/status.go +++ b/pkg/ui/status.go @@ -113,7 +113,6 @@ func updateEpochStatus() { log.Error(stats.Error.Error()) } else { if stats.Outdated == 0 { - log.Debug("Everything is up-to-date!") epochPatchesApplied = true } }