eburk/EpochSilicon
1
0
Fork 0
Code Issues 3 Pull Requests Packages Releases 7 Activity

Improve logging #2

Merged
eburk merged 6 commits from improve-logging into main 2025-07-24 15:30:33 +00:00
Conversation 0 Commits 6 Files Changed 22 +343 -242
19 changed files with 343 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit caf2004388 - Show all commits

2
FyneApp.toml
View File

@@ -3,4 +3,4 @@
Name = "EpochSilicon" Name = "EpochSilicon"
ID = "com.burkey.epochsilicon" ID = "com.burkey.epochsilicon"
Version = "1.0.0" Version = "1.0.0"
Build = 4 Build = 9

2
go.mod
View File

@@ -6,7 +6,7 @@ toolchain go1.24.5
require ( require (
fyne.io/fyne/v2 v2.6.1 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/rs/zerolog v1.34.0
github.com/zalando/go-keyring v0.2.6 github.com/zalando/go-keyring v0.2.6
howett.net/plist v1.0.1 howett.net/plist v1.0.1

2
go.sum
View File

@@ -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-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 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-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 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=

7
pkg/launcher/launcher.go
View File

@@ -16,10 +16,9 @@ import (
"fyne.io/fyne/v2/dialog" "fyne.io/fyne/v2/dialog"
) )
var EnableMetalHud = false // Default to disabled var EnableMetalHud = false // Default to disabled
var CustomEnvVars = "" // Custom environment variables var CustomEnvVars = "" // Custom environment variables
var EnableVanillaTweaks = false // Default to disabled var AutoDeleteWdb = false // Default to disabled
var AutoDeleteWdb = false // Default to disabled
// Terminal state management // Terminal state management
var ( var (

5
pkg/log/logging.go
View File

@@ -16,7 +16,7 @@ var (
func SetupLogging() { func SetupLogging() {
logFilePointer = nil logFilePointer = nil
ToConsole(zerolog.InfoLevel) ToConsole(zerolog.DebugLevel)
} }
func Close() { func Close() {
@@ -33,7 +33,8 @@ func ToFile(level zerolog.Level) {
logger.Error().Msg(err.Error()) logger.Error().Msg(err.Error())
return 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) { func ToConsole(level zerolog.Level) {

2
pkg/patching/patching.go
View File

@@ -204,8 +204,8 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
// TODO: Change from dialog to pulsing animation // 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) 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 paths.DownloadingPatches = true
log.Debug("Attempting to download Epoch patches...")
go func() { go func() {
log.Debug("Attempting to download patches...")
stats := epoch.Update(paths.EpochPath, true, true, false) stats := epoch.Update(paths.EpochPath, true, true, false)
if stats.Error != nil { if stats.Error != nil {
errMsg := fmt.Sprintf("failed to update Epoch files: %v", stats.Error) errMsg := fmt.Sprintf("failed to update Epoch files: %v", stats.Error)

1
pkg/ui/status.go
View File

@@ -113,7 +113,6 @@ func updateEpochStatus() {
log.Error(stats.Error.Error()) log.Error(stats.Error.Error())
} else { } else {
if stats.Outdated == 0 { if stats.Outdated == 0 {
log.Debug("Everything is up-to-date!")
epochPatchesApplied = true epochPatchesApplied = true
} }
} }