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

Improve logging (#2)

Browse Source 
Reviewed-on: #2
This commit is contained in:
Evan Burkey
2025-07-24 15:30:33 +00:00
parent 71f044e6e0
commit bc80ca2c9c
22 changed files with 411 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/debug/debug.go
View File

@@ -1,15 +0,0 @@
//go:build !release
package debug
import "log"
// Printf logs with fmt.Printf style formatting in debug builds
func Printf(format string, v ...interface{}) {
log.Printf(format, v...)
}
// Println logs with fmt.Println style in debug builds
func Println(v ...interface{}) {
log.Println(v...)
}

13
pkg/debug/debug_release.go
View File

@@ -1,13 +0,0 @@
//go:build release
package debug
// Printf is a no-op in release builds
func Printf(format string, v ...interface{}) {
// No-op in release builds to reduce binary size
}
// Println is a no-op in release builds
func Println(v ...interface{}) {
// No-op in release builds to reduce binary size
}

62
pkg/launcher/launcher.go
View File

@@ -2,13 +2,13 @@ package launcher
import (
"bufio"
"epochsilicon/pkg/log"
"fmt"
"os"
"os/exec"
"path/filepath"
"sync"
"epochsilicon/pkg/debug"
"epochsilicon/pkg/paths" // Corrected import path
"epochsilicon/pkg/utils" // Corrected import path
@@ -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 (
@@ -41,7 +40,7 @@ func runGameIntegrated(parentWindow fyne.Window, shellCmd string) error {
// Parse the shell command to extract components
// The shellCmd format is: cd <path> && <envVars> <rosettaExec> <wineloader> <wowExe>
debug.Printf("Parsing shell command: %s", shellCmd)
log.Debugf("Parsing shell command: %s", shellCmd)
// Create the command without context cancellation
cmd := exec.Command("sh", "-c", shellCmd)
@@ -71,7 +70,7 @@ func runGameIntegrated(parentWindow fyne.Window, shellCmd string) error {
scanner := bufio.NewScanner(stdout)
for scanner.Scan() {
line := scanner.Text()
debug.Printf("GAME STDOUT: %s", line)
log.WineLoggerStdout(line)
}
}()
@@ -79,7 +78,7 @@ func runGameIntegrated(parentWindow fyne.Window, shellCmd string) error {
scanner := bufio.NewScanner(stderr)
for scanner.Scan() {
line := scanner.Text()
debug.Printf("GAME STDERR: %s", line)
log.WineLoggerStderr(line)
}
}()
@@ -93,9 +92,9 @@ func runGameIntegrated(parentWindow fyne.Window, shellCmd string) error {
}()
if err := cmd.Wait(); err != nil {
debug.Printf("Game process ended with error: %v", err)
log.Debugf("Game process ended with error: %v", err)
} else {
debug.Println("Game process ended successfully")
log.Debug("Game process ended successfully")
}
}()
@@ -103,7 +102,7 @@ func runGameIntegrated(parentWindow fyne.Window, shellCmd string) error {
}
func LaunchGame(myWindow fyne.Window) {
debug.Println("Launch Game button clicked")
log.Debug("Launch Game button clicked")
if paths.CrossoverPath == "" {
dialog.ShowError(fmt.Errorf("CrossOver path not set. Please set it in the patcher."), myWindow)
@@ -132,7 +131,7 @@ func LaunchGame(myWindow fyne.Window) {
}
gameMutex.Unlock()
debug.Println("Preparing to launch EpochSilicon...")
log.Debug("Preparing to launch EpochSilicon...")
wowExePath := filepath.Join(paths.EpochPath, "Project-Epoch.exe")
@@ -163,20 +162,20 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) {
if AutoDeleteWdb {
wdbPath := filepath.Join(paths.EpochPath, "WDB")
if utils.DirExists(wdbPath) {
debug.Printf("Auto-deleting WDB directory: %s", wdbPath)
log.Debugf("Auto-deleting WDB directory: %s", wdbPath)
if err := os.RemoveAll(wdbPath); err != nil {
debug.Printf("Warning: failed to auto-delete WDB directory: %v", err)
log.Debugf("Warning: failed to auto-delete WDB directory: %v", err)
// Don't block the launch, just log the error
} else {
debug.Printf("Successfully auto-deleted WDB directory")
log.Debugf("Successfully auto-deleted WDB directory")
}
} else {
debug.Printf("WDB directory not found, nothing to delete")
log.Debugf("WDB directory not found, nothing to delete")
}
}
// Since RosettaX87 service is already running, we can directly launch WoW
debug.Println("RosettaX87 service is running. Proceeding to launch WoW.")
log.Debug("RosettaX87 service is running. Proceeding to launch WoW.")
if paths.CrossoverPath == "" || paths.EpochPath == "" {
dialog.ShowError(fmt.Errorf("CrossOver path or Epoch path is not set. Cannot launch WoW."), myWindow)
@@ -201,29 +200,12 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) {
utils.QuotePathForShell(wineloader2Path),
utils.QuotePathForShell(wowExePath))
// Check user preference for terminal display
prefs, _ := utils.LoadPrefs()
if prefs.ShowTerminalNormally {
// Use the old method with external Terminal.app
escapedShellCmd := utils.EscapeStringForAppleScript(shellCmd)
cmd2Script := fmt.Sprintf("tell application \"Terminal\" to do script \"%s\"", escapedShellCmd)
debug.Println("Executing WoW launch command via AppleScript...")
if !utils.RunOsascript(cmd2Script, myWindow) {
return
}
debug.Println("Launch command executed. Check the new terminal window.")
} else {
// Use integrated terminal
debug.Printf("Shell command for integrated terminal: %s", shellCmd)
debug.Println("Executing WoW launch command with integrated terminal...")
if err := runGameIntegrated(myWindow, shellCmd); err != nil {
dialog.ShowError(fmt.Errorf("failed to launch game: %v", err), myWindow)
return
}
debug.Println("Game launched with integrated terminal. Check the application logs for output.")
// Use integrated terminal
log.Debugf("Shell command for integrated terminal: %s", shellCmd)
log.Debug("Executing WoW launch command with integrated terminal...")
if err := runGameIntegrated(myWindow, shellCmd); err != nil {
dialog.ShowError(fmt.Errorf("failed to launch game: %v", err), myWindow)
return
}
}

20
pkg/launcher/recommended.go
View File

@@ -1,13 +1,13 @@
package launcher
import (
"epochsilicon/pkg/log"
"fmt"
"os"
"path/filepath"
"regexp"
"strings"
"epochsilicon/pkg/debug"
"epochsilicon/pkg/paths"
)
@@ -25,20 +25,20 @@ var RecommendedSettings = map[string]string{
// Returns true if all settings are correctly applied, false otherwise
func CheckRecommendedSettings() bool {
if paths.EpochPath == "" {
debug.Printf("Epoch path not set, cannot check Config.wtf")
log.Debugf("Epoch path not set, cannot check Config.wtf")
return false
}
configPath := filepath.Join(paths.EpochPath, "WTF", "Config.wtf")
if _, err := os.Stat(configPath); os.IsNotExist(err) {
debug.Printf("Config.wtf not found at %s", configPath)
log.Debugf("Config.wtf not found at %s", configPath)
return false
}
content, err := os.ReadFile(configPath)
if err != nil {
debug.Printf("Failed to read Config.wtf: %v", err)
log.Debugf("Failed to read Config.wtf: %v", err)
return false
}
@@ -47,12 +47,12 @@ func CheckRecommendedSettings() bool {
// Check each recommended setting
for setting, expectedValue := range RecommendedSettings {
if !isSettingCorrect(configText, setting, expectedValue) {
debug.Printf("Setting %s not found or incorrect in Config.wtf", setting)
log.Debugf("Setting %s not found or incorrect in Config.wtf", setting)
return false
}
}
debug.Printf("All recommended settings are correctly applied")
log.Debugf("All recommended settings are correctly applied")
return true
}
@@ -91,7 +91,7 @@ func ApplyRecommendedSettings() error {
if content, err := os.ReadFile(configPath); err == nil {
configText = string(content)
} else {
debug.Printf("Config.wtf not found, creating new file")
log.Debugf("Config.wtf not found, creating new file")
configText = ""
}
@@ -105,7 +105,7 @@ func ApplyRecommendedSettings() error {
return fmt.Errorf("failed to write Config.wtf: %v", err)
}
debug.Printf("Successfully applied recommended settings to Config.wtf")
log.Debugf("Successfully applied recommended settings to Config.wtf")
return nil
}
@@ -120,14 +120,14 @@ func updateOrAddSetting(configText, setting, value string) string {
if re.MatchString(configText) {
// Replace existing setting
configText = re.ReplaceAllString(configText, newSetting)
debug.Printf("Updated setting %s to %s", setting, value)
log.Debugf("Updated setting %s to %s", setting, value)
} else {
// Add new setting
if configText != "" && !strings.HasSuffix(configText, "\n") {
configText += "\n"
}
configText += newSetting + "\n"
debug.Printf("Added new setting %s with value %s", setting, value)
log.Debugf("Added new setting %s with value %s", setting, value)
}
return configText

142
pkg/log/logging.go Normal file
View File

@@ -0,0 +1,142 @@
package log
import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"gopkg.in/natefinch/lumberjack.v2"
"io"
"os"
"path/filepath"
)
var (
logger zerolog.Logger
wineLogger zerolog.Logger
)
func SetupLogging() {
// App logs
path, err := getLogfilePath()
if err != nil {
log.Error().Err(err).Str("path", path).Msg("Failed to get log path")
return
}
var mw io.Writer
l := createLogWriter(path, 10, 3)
if l != nil {
mw = io.MultiWriter(zerolog.ConsoleWriter{Out: os.Stdout}, l)
} else {
mw = io.MultiWriter(zerolog.ConsoleWriter{Out: os.Stdout})
}
logger = zerolog.New(mw).With().Timestamp().Logger()
SetLevelInfo()
// Wine logs
wineLogPath, err := getWineLogfilePath()
if err != nil {
Errorf("Failed to get wine log path: %v", err)
return
}
l = createLogWriter(wineLogPath, 25, 1)
if l != nil {
mw = io.MultiWriter(zerolog.ConsoleWriter{Out: os.Stdout}, l)
} else {
mw = io.MultiWriter(zerolog.ConsoleWriter{Out: os.Stdout})
}
wineLogger = zerolog.New(mw).With().Timestamp().Logger()
wineLogger.Level(zerolog.InfoLevel)
}
func createLogWriter(path string, maxSize int, maxBackups int) io.Writer {
if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
log.Error().Err(err).Str("path", path).Msg("Failed to create log path")
return nil
}
return &lumberjack.Logger{
Filename: path,
MaxSize: maxSize,
MaxBackups: maxBackups,
}
}
func SetLevelDebug() {
logger.Level(zerolog.DebugLevel)
}
func SetLevelInfo() {
logger.Level(zerolog.InfoLevel)
}
func getLogfilePath() (string, error) {
dir, err := os.UserConfigDir()
if err != nil {
return "", err
}
return filepath.Join(dir, "EpochSilicon", "epochsilicon.log"), nil
}
func getWineLogfilePath() (string, error) {
dir, err := os.UserConfigDir()
if err != nil {
return "", err
}
return filepath.Join(dir, "EpochSilicon", "epochsilicon.log"), nil
}
func Debug(msg string) {
logger.Debug().Msg(msg)
}
func Debugf(format string, args ...interface{}) {
logger.Debug().Msgf(format, args...)
}
func Info(msg string) {
logger.Info().Msg(msg)
}
func Infof(format string, args ...interface{}) {
logger.Info().Msgf(format, args...)
}
func Warn(msg string) {
logger.Warn().Msg(msg)
}
func Warnf(format string, args ...interface{}) {
logger.Warn().Msgf(format, args...)
}
func Error(msg string) {
logger.Error().Msg(msg)
}
func Errorf(format string, args ...interface{}) {
logger.Error().Msgf(format, args...)
}
func Fatal(msg string) {
logger.Fatal().Msg(msg)
}
func Fatalf(format string, args ...interface{}) {
logger.Fatal().Msgf(format, args...)
}
func Panic(msg string) {
logger.Panic().Msg(msg)
}
func Panicf(format string, args ...interface{}) {
logger.Panic().Msgf(format, args...)
}
func WineLoggerStdout(msg string) {
wineLogger.Info().Msgf("STDOUT: %s", msg)
}
func WineLoggerStderr(msg string) {
wineLogger.Info().Msgf("STDERR: %s", msg)
}

141
pkg/patching/patching.go
View File

@@ -2,18 +2,17 @@ package patching
import (
"bytes"
"epochsilicon/pkg/log"
"errors"
"fmt"
"git.burkey.co/eburk/epochcli/pkg/epoch"
"io"
"log"
"os"
"os/exec"
"path/filepath"
"regexp"
"strings"
"epochsilicon/pkg/debug"
"epochsilicon/pkg/paths" // Corrected import path
"epochsilicon/pkg/utils" // Corrected import path
@@ -22,7 +21,7 @@ import (
)
func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
debug.Println("Patch Epoch clicked")
log.Debug("Patch Epoch clicked")
if paths.EpochPath == "" {
dialog.ShowError(fmt.Errorf("Epoch path not set. Please set it first."), myWindow)
return
@@ -38,25 +37,25 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
}
for resourceName, destPath := range filesToCopy {
debug.Printf("Processing resource: %s to %s", resourceName, destPath)
log.Debugf("Processing resource: %s to %s", resourceName, destPath)
// Check if file already exists and has correct size
if utils.PathExists(destPath) && utils.CompareFileWithBundledResource(destPath, resourceName) {
debug.Printf("File %s already exists with correct size, skipping copy", destPath)
log.Debugf("File %s already exists with correct size, skipping copy", destPath)
continue
}
if utils.PathExists(destPath) {
debug.Printf("File %s exists but has incorrect size, updating...", destPath)
log.Debugf("File %s exists but has incorrect size, updating...", destPath)
} else {
debug.Printf("File %s does not exist, creating...", destPath)
log.Debugf("File %s does not exist, creating...", destPath)
}
resource, err := fyne.LoadResourceFromPath(resourceName)
if err != nil {
errMsg := fmt.Sprintf("failed to open bundled resource %s: %v", resourceName, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -66,7 +65,7 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if err != nil {
errMsg := fmt.Sprintf("failed to create destination file %s: %v", destPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -77,22 +76,22 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if err != nil {
errMsg := fmt.Sprintf("failed to copy bundled resource %s to %s: %v", resourceName, destPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
}
debug.Printf("Successfully copied %s to %s", resourceName, destPath)
log.Debugf("Successfully copied %s to %s", resourceName, destPath)
}
debug.Printf("Preparing rosettax87 directory at: %s", targetRosettaX87Dir)
log.Debugf("Preparing rosettax87 directory at: %s", targetRosettaX87Dir)
if err := os.RemoveAll(targetRosettaX87Dir); err != nil {
debug.Printf("Warning: could not remove existing rosettax87 folder '%s': %v", targetRosettaX87Dir, err)
log.Debugf("Warning: could not remove existing rosettax87 folder '%s': %v", targetRosettaX87Dir, err)
}
if err := os.MkdirAll(targetRosettaX87Dir, 0755); err != nil {
errMsg := fmt.Sprintf("failed to create directory %s: %v", targetRosettaX87Dir, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -104,12 +103,12 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
}
for resourceName, destPath := range rosettaFilesToCopy {
debug.Printf("Processing rosetta resource: %s to %s", resourceName, destPath)
log.Debugf("Processing rosetta resource: %s to %s", resourceName, destPath)
resource, err := fyne.LoadResourceFromPath(resourceName)
if err != nil {
errMsg := fmt.Sprintf("failed to open bundled resource %s: %v", resourceName, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -119,7 +118,7 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if err != nil {
errMsg := fmt.Sprintf("failed to create destination file %s: %v", destPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -130,7 +129,7 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
destinationFile.Close()
errMsg := fmt.Sprintf("failed to copy bundled resource %s to %s: %v", resourceName, destPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
@@ -138,31 +137,31 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
destinationFile.Close()
if filepath.Base(destPath) == "rosettax87" {
debug.Printf("Setting execute permission for %s", destPath)
log.Debugf("Setting execute permission for %s", destPath)
if err := os.Chmod(destPath, 0755); err != nil {
errMsg := fmt.Sprintf("failed to set execute permission for %s: %v", destPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedEpoch = false
updateAllStatuses()
return
}
}
debug.Printf("Successfully copied %s to %s", resourceName, destPath)
log.Debugf("Successfully copied %s to %s", resourceName, destPath)
}
debug.Printf("Checking dlls.txt file at: %s", dllsTextFile)
log.Debugf("Checking dlls.txt file at: %s", dllsTextFile)
winerosettaEntry := "winerosetta.dll"
needsWinerosettaUpdate := true
if fileContentBytes, err := os.ReadFile(dllsTextFile); err == nil {
fileContent := string(fileContentBytes)
if strings.Contains(fileContent, winerosettaEntry) {
debug.Printf("dlls.txt already contains %s", winerosettaEntry)
log.Debugf("dlls.txt already contains %s", winerosettaEntry)
needsWinerosettaUpdate = false
}
} else {
debug.Printf("dlls.txt not found, will create a new one")
log.Debugf("dlls.txt not found, will create a new one")
}
if needsWinerosettaUpdate {
@@ -173,7 +172,7 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if err != nil {
errMsg := fmt.Sprintf("failed to read dlls.txt for update: %v", err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
}
}
@@ -187,39 +186,43 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if needsWinerosettaUpdate {
if !strings.Contains(updatedContent, winerosettaEntry+"\n") {
updatedContent += winerosettaEntry + "\n"
debug.Printf("Adding %s to dlls.txt", winerosettaEntry)
log.Debugf("Adding %s to dlls.txt", winerosettaEntry)
}
}
if err := os.WriteFile(dllsTextFile, []byte(updatedContent), 0644); err != nil {
errMsg := fmt.Sprintf("failed to update dlls.txt: %v", err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
} else {
debug.Printf("Successfully updated dlls.txt")
log.Debugf("Successfully updated dlls.txt")
}
}
debug.Println("Downloading updates from Project Epoch servers.")
log.Debug("Downloading updates from Project Epoch servers.")
// 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() {
stats, err := epoch.Update(paths.EpochPath, true, true, false)
if err != nil {
errMsg := fmt.Sprintf("failed to update Epoch files: %v", err)
stats := epoch.Update(paths.EpochPath, true, true, false)
if stats.Error != nil {
errMsg := fmt.Sprintf("failed to update Epoch files: %v", stats.Error)
fyne.Do(func() {
dialog.ShowError(errors.New(errMsg), myWindow)
})
paths.DownloadingPatches = false
log.Println(errMsg)
log.Error(errMsg)
} else {
for _, msg := range stats.LogMessages {
log.Debug(msg)
}
log.Infof("Successfully updated %d Epoch files", stats.Updated)
log.Debug("Epoch patching with bundled resources completed successfully.")
fyne.Do(func() {
dialog.ShowInformation("Success", "Epoch patching process completed.", myWindow)
})
}
log.Printf("Successfully updated %d Epoch files", stats.Updated)
debug.Println("Epoch patching with bundled resources completed successfully.")
fyne.Do(func() {
dialog.ShowInformation("Success", "Epoch patching process completed.", myWindow)
})
fyne.DoAndWait(func() {
paths.DownloadingPatches = false
updateAllStatuses()
@@ -229,7 +232,7 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
}
func PatchCrossOver(myWindow fyne.Window, updateAllStatuses func()) {
debug.Println("Patch CrossOver clicked")
log.Debug("Patch CrossOver clicked")
if paths.CrossoverPath == "" {
dialog.ShowError(fmt.Errorf("CrossOver path not set. Please set it first."), myWindow)
return
@@ -246,7 +249,7 @@ func PatchCrossOver(myWindow fyne.Window, updateAllStatuses func()) {
return
}
debug.Printf("Copying %s to %s", wineloaderOrig, wineloaderCopy)
log.Debugf("Copying %s to %s", wineloaderOrig, wineloaderCopy)
if err := utils.CopyFile(wineloaderOrig, wineloaderCopy); err != nil {
errMsg := fmt.Sprintf("failed to copy wineloader: %v", err)
if strings.Contains(err.Error(), "operation not permitted") {
@@ -258,40 +261,40 @@ func PatchCrossOver(myWindow fyne.Window, updateAllStatuses func()) {
return
}
debug.Printf("Executing: codesign --remove-signature %s", wineloaderCopy)
log.Debugf("Executing: codesign --remove-signature %s", wineloaderCopy)
cmd := exec.Command("codesign", "--remove-signature", wineloaderCopy)
combinedOutput, err := cmd.CombinedOutput()
if err != nil {
derrMsg := fmt.Sprintf("failed to remove signature from %s: %v\nOutput: %s", wineloaderCopy, err, string(combinedOutput))
dialog.ShowError(errors.New(derrMsg), myWindow)
debug.Println(derrMsg)
log.Debug(derrMsg)
paths.PatchesAppliedCrossOver = false
if err := os.Remove(wineloaderCopy); err != nil {
debug.Printf("Warning: failed to cleanup wineloader2 after codesign failure: %v", err)
log.Debugf("Warning: failed to cleanup wineloader2 after codesign failure: %v", err)
}
updateAllStatuses()
return
}
debug.Printf("codesign output: %s", string(combinedOutput))
log.Debugf("codesign output: %s", string(combinedOutput))
debug.Printf("Setting execute permissions for %s", wineloaderCopy)
log.Debugf("Setting execute permissions for %s", wineloaderCopy)
if err := os.Chmod(wineloaderCopy, 0755); err != nil {
errMsg := fmt.Sprintf("failed to set executable permissions for %s: %v", wineloaderCopy, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
paths.PatchesAppliedCrossOver = false
updateAllStatuses()
return
}
debug.Println("CrossOver patching completed successfully.")
log.Debug("CrossOver patching completed successfully.")
paths.PatchesAppliedCrossOver = true
dialog.ShowInformation("Success", "CrossOver patching process completed.", myWindow)
updateAllStatuses()
}
func UnpatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
debug.Println("Unpatch Epoch clicked")
log.Debug("Unpatch Epoch clicked")
if paths.EpochPath == "" {
dialog.ShowError(fmt.Errorf("Epoch path not set. Please set it first."), myWindow)
return
@@ -305,13 +308,13 @@ func UnpatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
// Remove the rosettaX87 directory
if utils.DirExists(rosettaX87DirPath) {
debug.Printf("Removing directory: %s", rosettaX87DirPath)
log.Debugf("Removing directory: %s", rosettaX87DirPath)
if err := os.RemoveAll(rosettaX87DirPath); err != nil {
errMsg := fmt.Sprintf("failed to remove directory %s: %v", rosettaX87DirPath, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
} else {
debug.Printf("Successfully removed directory: %s", rosettaX87DirPath)
log.Debugf("Successfully removed directory: %s", rosettaX87DirPath)
}
}
@@ -319,25 +322,25 @@ func UnpatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
filesToRemove := []string{winerosettaDllPath, d3d9DllPath}
for _, file := range filesToRemove {
if utils.PathExists(file) {
debug.Printf("Removing file: %s", file)
log.Debugf("Removing file: %s", file)
if err := os.Remove(file); err != nil {
errMsg := fmt.Sprintf("failed to remove file %s: %v", file, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
} else {
debug.Printf("Successfully removed file: %s", file)
log.Debugf("Successfully removed file: %s", file)
}
}
}
// Update dlls.txt file - remove winerosetta.dll
if utils.PathExists(dllsTextFile) {
debug.Printf("Updating dlls.txt file: %s", dllsTextFile)
log.Debugf("Updating dlls.txt file: %s", dllsTextFile)
content, err := os.ReadFile(dllsTextFile)
if err != nil {
errMsg := fmt.Sprintf("failed to read dlls.txt file: %v", err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
} else {
lines := strings.Split(string(content), "\n")
filteredLines := make([]string, 0, len(lines))
@@ -353,21 +356,21 @@ func UnpatchEpoch(myWindow fyne.Window, updateAllStatuses func()) {
if err := os.WriteFile(dllsTextFile, []byte(updatedContent), 0644); err != nil {
errMsg := fmt.Sprintf("failed to update dlls.txt file: %v", err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
} else {
debug.Printf("Successfully updated dlls.txt file")
log.Debugf("Successfully updated dlls.txt file")
}
}
}
debug.Println("Epoch unpatching completed successfully.")
log.Debug("Epoch unpatching completed successfully.")
paths.PatchesAppliedEpoch = false
dialog.ShowInformation("Success", "Epoch unpatching process completed.", myWindow)
updateAllStatuses()
}
func UnpatchCrossOver(myWindow fyne.Window, updateAllStatuses func()) {
debug.Println("Unpatch CrossOver clicked")
log.Debug("Unpatch CrossOver clicked")
if paths.CrossoverPath == "" {
dialog.ShowError(fmt.Errorf("CrossOver path not set. Please set it first."), myWindow)
return
@@ -376,21 +379,21 @@ func UnpatchCrossOver(myWindow fyne.Window, updateAllStatuses func()) {
wineloaderCopy := filepath.Join(paths.CrossoverPath, "Contents", "SharedSupport", "CrossOver", "CrossOver-Hosted Application", "wineloader2")
if utils.PathExists(wineloaderCopy) {
debug.Printf("Removing file: %s", wineloaderCopy)
log.Debugf("Removing file: %s", wineloaderCopy)
if err := os.Remove(wineloaderCopy); err != nil {
errMsg := fmt.Sprintf("failed to remove file %s: %v", wineloaderCopy, err)
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
updateAllStatuses()
return
} else {
debug.Printf("Successfully removed file: %s", wineloaderCopy)
log.Debugf("Successfully removed file: %s", wineloaderCopy)
}
} else {
debug.Printf("File not found to remove: %s", wineloaderCopy)
log.Debugf("File not found to remove: %s", wineloaderCopy)
}
debug.Println("CrossOver unpatching completed successfully.")
log.Debug("CrossOver unpatching completed successfully.")
paths.PatchesAppliedCrossOver = false
dialog.ShowInformation("Success", "CrossOver unpatching process completed.", myWindow)
updateAllStatuses()
@@ -407,14 +410,14 @@ func updateOrAddConfigSetting(configText, setting, value string) string {
if re.MatchString(configText) {
// Replace existing setting
configText = re.ReplaceAllString(configText, newSetting)
debug.Printf("Updated setting %s to %s", setting, value)
log.Debugf("Updated setting %s to %s", setting, value)
} else {
// Add new setting
if configText != "" && !strings.HasSuffix(configText, "\n") {
configText += "\n"
}
configText += newSetting + "\n"
debug.Printf("Added new setting %s with value %s", setting, value)
log.Debugf("Added new setting %s with value %s", setting, value)
}
return configText
@@ -428,7 +431,7 @@ func removeConfigSetting(configText, setting string) string {
if re.MatchString(configText) {
configText = re.ReplaceAllString(configText, "")
debug.Printf("Removed setting %s from config", setting)
log.Debugf("Removed setting %s from config", setting)
}
return configText

16
pkg/paths/paths.go
View File

@@ -1,8 +1,8 @@
package paths
import (
"epochsilicon/pkg/log"
"fmt"
"log"
"os"
"path/filepath"
@@ -33,7 +33,7 @@ func SelectCrossOverPath(myWindow fyne.Window, crossoverPathLabel *widget.RichTe
return
}
if uri == nil {
log.Println("CrossOver path selection cancelled.")
log.Info("CrossOver path selection cancelled.")
updateAllStatuses()
return
}
@@ -41,14 +41,14 @@ func SelectCrossOverPath(myWindow fyne.Window, crossoverPathLabel *widget.RichTe
if filepath.Ext(selectedPath) == ".app" && utils.DirExists(selectedPath) {
CrossoverPath = selectedPath
PatchesAppliedCrossOver = false
log.Println("CrossOver path set to:", CrossoverPath)
log.Infof("CrossOver path set to:", CrossoverPath)
// Save to prefs
prefs, _ := utils.LoadPrefs()
prefs.CrossOverPath = selectedPath
utils.SavePrefs(prefs)
} else {
dialog.ShowError(fmt.Errorf("invalid selection: '%s'. Please select a valid .app bundle", selectedPath), myWindow)
log.Println("Invalid CrossOver path selected:", selectedPath)
log.Infof("Invalid CrossOver path selected:", selectedPath)
}
updateAllStatuses()
}, myWindow)
@@ -61,7 +61,7 @@ func SelectEpochPath(myWindow fyne.Window, epochPathLabel *widget.RichText, upda
return
}
if uri == nil {
log.Println("Epoch path selection cancelled.")
log.Info("Epoch path selection cancelled.")
updateAllStatuses()
return
}
@@ -69,14 +69,14 @@ func SelectEpochPath(myWindow fyne.Window, epochPathLabel *widget.RichText, upda
if utils.DirExists(selectedPath) {
EpochPath = selectedPath
PatchesAppliedEpoch = false
log.Println("Epoch path set to:", EpochPath)
log.Infof("Epoch path set to:", EpochPath)
// Save to prefs
prefs, _ := utils.LoadPrefs()
prefs.EpochPath = selectedPath
utils.SavePrefs(prefs)
} else {
dialog.ShowError(fmt.Errorf("invalid selection: '%s' is not a valid directory", selectedPath), myWindow)
log.Println("Invalid Epoch path selected:", selectedPath)
log.Infof("Invalid Epoch path selected:", selectedPath)
}
updateAllStatuses()
}, myWindow)
@@ -102,7 +102,7 @@ func CheckDefaultCrossOverPath() {
if CrossoverPath == "" {
if info, err := os.Stat(DefaultCrossOverPath); err == nil && info.IsDir() {
CrossoverPath = DefaultCrossOverPath
log.Println("Pre-set CrossOver to default:", DefaultCrossOverPath)
log.Infof("Pre-set CrossOver to default:", DefaultCrossOverPath)
}
}
}

46
pkg/service/service.go
View File

@@ -2,8 +2,8 @@ package service
import (
"bytes"
"epochsilicon/pkg/log"
"fmt"
"log"
"os/exec"
"path/filepath"
"strings"
@@ -27,7 +27,7 @@ var (
// CleanupExistingServices kills any existing rosettax87 processes
func CleanupExistingServices() error {
log.Println("Cleaning up any existing rosettax87 processes...")
log.Info("Cleaning up any existing rosettax87 processes...")
// Find all rosettax87 processes
cmd := exec.Command("pgrep", "-f", "rosettax87")
@@ -49,16 +49,16 @@ func CleanupExistingServices() error {
err := killCmd.Run()
if err != nil {
// If regular kill fails, try with sudo (but this might fail too)
log.Printf("Regular kill failed for process %s, trying sudo: %v", pid, err)
log.Infof("Regular kill failed for process %s, trying sudo: %v", pid, err)
sudoKillCmd := exec.Command("sudo", "kill", "-9", pid)
err2 := sudoKillCmd.Run()
if err2 != nil {
log.Printf("Failed to kill process %s with sudo: %v", pid, err2)
log.Infof("Failed to kill process %s with sudo: %v", pid, err2)
} else {
log.Printf("Killed existing rosettax87 process with sudo: %s", pid)
log.Infof("Killed existing rosettax87 process with sudo: %s", pid)
}
} else {
log.Printf("Killed existing rosettax87 process: %s", pid)
log.Infof("Killed existing rosettax87 process: %s", pid)
}
}
@@ -77,7 +77,7 @@ func isRosettaSocketActive() bool {
// StartRosettaX87Service starts the RosettaX87 service with sudo privileges
func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
log.Println("Starting RosettaX87 service...")
log.Info("Starting RosettaX87 service...")
if paths.EpochPath == "" {
dialog.ShowError(fmt.Errorf("Epoch path not set. Please set it first"), myWindow)
@@ -103,7 +103,7 @@ func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
// Load user preferences
prefs, err := utils.LoadPrefs()
if err != nil {
log.Printf("Failed to load preferences: %v", err)
log.Infof("Failed to load preferences: %v", err)
prefs = &utils.UserPrefs{} // Use default prefs
}
@@ -163,7 +163,7 @@ func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
if shouldSavePassword {
// Save password to keychain
if err := utils.SaveSudoPassword(password); err != nil {
log.Printf("Failed to save password to keychain: %v", err)
log.Infof("Failed to save password to keychain: %v", err)
// Don't block the service start, just log the error
}
} else {
@@ -174,7 +174,7 @@ func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
// Update preferences
prefs.SaveSudoPassword = shouldSavePassword
if err := utils.SavePrefs(prefs); err != nil {
log.Printf("Failed to save preferences: %v", err)
log.Infof("Failed to save preferences: %v", err)
}
// Close the dialog
@@ -191,13 +191,13 @@ func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
err := startServiceWithPassword(rosettaX87Dir, rosettaX87Exe, password)
paths.ServiceStarting = false
if err != nil {
log.Printf("Failed to start RosettaX87 service: %v", err)
log.Infof("Failed to start RosettaX87 service: %v", err)
fyne.Do(func() {
dialog.ShowError(fmt.Errorf("failed to start RosettaX87 service: %v", err), myWindow)
})
ServiceRunning = false
} else {
log.Println("RosettaX87 service started successfully")
log.Info("RosettaX87 service started successfully")
ServiceRunning = true
}
fyne.Do(func() {
@@ -215,7 +215,7 @@ func StartRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
passwordContainer,
func(confirmed bool) {
if !confirmed {
log.Println("Service start cancelled by user")
log.Info("Service start cancelled by user")
return
}
confirmFunc()
@@ -263,7 +263,7 @@ func startServiceWithPassword(workingDir, executable, password string) error {
stderrOutput := stderr.String()
stdoutOutput := stdout.String()
log.Printf("Password test - Exit code: %v, Stderr: %q, Stdout: %q", err, stderrOutput, stdoutOutput)
log.Infof("Password test - Exit code: %v, Stderr: %q, Stdout: %q", err, stderrOutput, stdoutOutput)
// Check for authentication failure indicators
if strings.Contains(stderrOutput, "Sorry, try again") ||
@@ -283,7 +283,7 @@ func startServiceWithPassword(workingDir, executable, password string) error {
}
// If we get here, the password is correct, now start the actual service
log.Println("Password validated successfully, starting rosettax87 service...")
log.Info("Password validated successfully, starting rosettax87 service...")
cmd := exec.Command("sudo", "-S", executable)
cmd.Dir = workingDir
@@ -325,25 +325,25 @@ func startServiceWithPassword(workingDir, executable, password string) error {
if cmd.ProcessState != nil && cmd.ProcessState.Exited() {
stderrOutput := stderr.String()
stdoutOutput := stdout.String()
log.Printf("Process exited - Stdout: %q, Stderr: %q", stdoutOutput, stderrOutput)
log.Infof("Process exited - Stdout: %q, Stderr: %q", stdoutOutput, stderrOutput)
return fmt.Errorf("process exited prematurely with code: %d. Stderr: %s", cmd.ProcessState.ExitCode(), stderrOutput)
}
// Verify the service is actually listening
time.Sleep(1 * time.Second)
if !isRosettaSocketActive() {
log.Printf("Service started but socket not active - Stdout: %q, Stderr: %q", stdout.String(), stderr.String())
log.Infof("Service started but socket not active - Stdout: %q, Stderr: %q", stdout.String(), stderr.String())
cmd.Process.Kill()
return fmt.Errorf("service started but is not listening on socket")
}
log.Printf("RosettaX87 service started successfully with PID: %d", servicePID)
log.Infof("RosettaX87 service started successfully with PID: %d", servicePID)
return nil
}
// StopRosettaX87Service stops the running RosettaX87 service
func StopRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
log.Println("Stopping RosettaX87 service...")
log.Info("Stopping RosettaX87 service...")
if !ServiceRunning {
dialog.ShowInformation("Service Status", "RosettaX87 service is not running.", myWindow)
@@ -354,11 +354,11 @@ func StopRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
// Send SIGTERM to gracefully stop the process
err := serviceCmd.Process.Signal(syscall.SIGTERM)
if err != nil {
log.Printf("Failed to send SIGTERM to process: %v", err)
log.Infof("Failed to send SIGTERM to process: %v", err)
// Try SIGKILL as fallback
err = serviceCmd.Process.Kill()
if err != nil {
log.Printf("Failed to kill process: %v", err)
log.Infof("Failed to kill process: %v", err)
dialog.ShowError(fmt.Errorf("failed to stop service: %v", err), myWindow)
return
}
@@ -370,7 +370,7 @@ func StopRosettaX87Service(myWindow fyne.Window, updateAllStatuses func()) {
ServiceRunning = false
serviceCmd = nil
servicePID = 0
log.Println("RosettaX87 service stopped")
log.Info("RosettaX87 service stopped")
fyne.Do(func() {
dialog.ShowInformation("Service Stopped", "RosettaX87 service has been stopped.", myWindow)
updateAllStatuses()
@@ -407,7 +407,7 @@ func IsServiceRunning() bool {
// CleanupService ensures the service is stopped when the application exits
func CleanupService() {
log.Println("Cleaning up RosettaX87 service on application exit...")
log.Info("Cleaning up RosettaX87 service on application exit...")
CleanupExistingServices()
ServiceRunning = false
serviceCmd = nil

35
pkg/ui/components.go
View File

@@ -1,11 +1,11 @@
package ui
import (
"epochsilicon/pkg/log"
"net/url"
"strings"
"time"
"epochsilicon/pkg/debug"
"epochsilicon/pkg/launcher"
"epochsilicon/pkg/patching"
"epochsilicon/pkg/service"
@@ -27,7 +27,7 @@ func createOptionsComponents() {
prefs, _ := utils.LoadPrefs()
prefs.EnableMetalHud = checked
utils.SavePrefs(prefs)
debug.Printf("Metal HUD enabled: %v", launcher.EnableMetalHud)
log.Debugf("Metal HUD enabled: %v", launcher.EnableMetalHud)
})
metalHudCheckbox.SetChecked(prefs.EnableMetalHud)
launcher.EnableMetalHud = prefs.EnableMetalHud
@@ -37,17 +37,32 @@ func createOptionsComponents() {
prefs, _ := utils.LoadPrefs()
prefs.ShowTerminalNormally = checked
utils.SavePrefs(prefs)
debug.Printf("Show terminal normally: %v", checked)
log.Debugf("Show terminal normally: %v", checked)
})
showTerminalCheckbox.SetChecked(prefs.ShowTerminalNormally)
advancedLoggingCheckbox = widget.NewCheck("Advanced Logging", func(checked bool) {
// Save to preferences
prefs, _ := utils.LoadPrefs()
prefs.AdvancedLogging = checked
utils.SavePrefs(prefs)
log.Debugf("Advanced logging set to %v", checked)
if checked {
log.SetLevelDebug()
} else {
log.SetLevelInfo()
}
})
advancedLoggingCheckbox.SetChecked(prefs.AdvancedLogging)
autoDeleteWdbCheckbox = widget.NewCheck("Auto-delete WDB directory on launch", func(checked bool) {
launcher.AutoDeleteWdb = checked
// Save to preferences
prefs, _ := utils.LoadPrefs()
prefs.AutoDeleteWdb = checked
utils.SavePrefs(prefs)
debug.Printf("Auto-delete WDB enabled: %v", launcher.AutoDeleteWdb)
log.Debugf("Auto-delete WDB enabled: %v", launcher.AutoDeleteWdb)
})
autoDeleteWdbCheckbox.SetChecked(prefs.AutoDeleteWdb)
launcher.AutoDeleteWdb = prefs.AutoDeleteWdb
@@ -69,7 +84,7 @@ func createOptionsComponents() {
prefs, _ := utils.LoadPrefs()
prefs.EnvironmentVariables = text
utils.SavePrefs(prefs)
debug.Printf("Environment variables updated: %v", launcher.CustomEnvVars)
log.Debugf("Environment variables updated: %v", launcher.CustomEnvVars)
}
}
@@ -126,7 +141,7 @@ func createBottomBar(myWindow fyne.Window) fyne.CanvasObject {
githubURL := "https://git.burkey.co/eburk/epochsilicon"
parsedURL, err := url.Parse(githubURL)
if err != nil {
debug.Printf("Error parsing git URL: %v", err)
log.Debugf("Error parsing git URL: %v", err)
return
}
fyne.CurrentApp().OpenURL(parsedURL)
@@ -198,7 +213,7 @@ func createWineRegistryComponents() {
}()
if err := utils.SetOptionAsAltEnabled(true); err != nil {
debug.Printf("Failed to enable Option-as-Alt mapping: %v", err)
log.Debugf("Failed to enable Option-as-Alt mapping: %v", err)
// Update UI on main thread
fyne.Do(func() {
stopPulsingEffect()
@@ -206,7 +221,7 @@ func createWineRegistryComponents() {
})
time.Sleep(2 * time.Second) // Show error briefly
} else {
debug.Printf("Successfully enabled Option-as-Alt mapping")
log.Debugf("Successfully enabled Option-as-Alt mapping")
// Update preferences
prefs, _ := utils.LoadPrefs()
prefs.RemapOptionAsAlt = true
@@ -240,7 +255,7 @@ func createWineRegistryComponents() {
}()
if err := utils.SetOptionAsAltEnabled(false); err != nil {
debug.Printf("Failed to disable Option-as-Alt mapping: %v", err)
log.Debugf("Failed to disable Option-as-Alt mapping: %v", err)
// Update UI on main thread
fyne.Do(func() {
stopPulsingEffect()
@@ -248,7 +263,7 @@ func createWineRegistryComponents() {
})
time.Sleep(2 * time.Second) // Show error briefly
} else {
debug.Printf("Successfully disabled Option-as-Alt mapping")
log.Debugf("Successfully disabled Option-as-Alt mapping")
// Update preferences
prefs, _ := utils.LoadPrefs()
prefs.RemapOptionAsAlt = false

4
pkg/ui/layout.go
View File

@@ -1,7 +1,7 @@
package ui
import (
"epochsilicon/pkg/debug"
"epochsilicon/pkg/log"
"epochsilicon/pkg/paths"
"fyne.io/fyne/v2"
@@ -34,7 +34,7 @@ func createLogoContainer() fyne.CanvasObject {
// Load the application logo
logoResource, err := fyne.LoadResourceFromPath("Icon.png")
if err != nil {
debug.Printf("Warning: could not load logo: %v", err)
log.Debugf("Warning: could not load logo: %v", err)
}
// Create the logo image with a smaller fixed size since we have a header now

9
pkg/ui/popup.go
View File

@@ -30,6 +30,7 @@ func showOptionsPopup() {
generalContainer := container.NewVBox(
generalTitle,
widget.NewSeparator(),
advancedLoggingCheckbox,
metalHudCheckbox,
showTerminalCheckbox,
autoDeleteWdbCheckbox,
@@ -222,11 +223,11 @@ func showTroubleshootingPopup() {
troubleshootingCloseButton = widget.NewButton("Close", func() {})
popupContent := container.NewBorder(
nil, // top
nil, // top
container.NewCenter(troubleshootingCloseButton), // bottom
nil, // left
nil, // right
container.NewPadded(scrollContainer), // center
nil, // left
nil, // right
container.NewPadded(scrollContainer), // center
)
windowSize := currentWindow.Content().Size()

16
pkg/ui/status.go
View File

@@ -1,7 +1,7 @@
package ui
import (
"epochsilicon/pkg/debug"
"epochsilicon/pkg/log"
"git.burkey.co/eburk/epochcli/pkg/epoch"
"os"
"path/filepath"
@@ -108,13 +108,13 @@ func updateEpochStatus() {
// Check for Epoch-specific files
epochPatchesApplied := false
stats, err := epoch.Update(paths.EpochPath, false, true, true)
if err != nil {
debug.Printf("Failed to get download Epoch patches: %v", err)
}
if stats.Outdated == 0 {
debug.Println("Nothing is outdated")
epochPatchesApplied = true
stats := epoch.Update(paths.EpochPath, false, true, true)
if stats.Error != nil {
log.Error(stats.Error.Error())
} else {
if stats.Outdated == 0 {
epochPatchesApplied = true
}
}
// Check if patched files have the correct size (matches bundled versions)

6
pkg/ui/updater.go
View File

@@ -1,11 +1,11 @@
package ui
import (
"epochsilicon/pkg/log"
"fmt"
"strings"
"time"
"epochsilicon/pkg/debug"
"epochsilicon/pkg/utils"
"fyne.io/fyne/v2"
@@ -105,7 +105,7 @@ func ShowUpdateDialog(updateInfo *utils.UpdateInfo, currentVersion string, myWin
if err != nil {
progressLabel.SetText(fmt.Sprintf("Download failed: %v", err))
debug.Printf("Download failed: %v", err)
log.Debugf("Download failed: %v", err)
// Re-enable close button
d.SetButtons([]fyne.CanvasObject{
@@ -123,7 +123,7 @@ func ShowUpdateDialog(updateInfo *utils.UpdateInfo, currentVersion string, myWin
err = utils.InstallUpdate(downloadPath)
if err != nil {
progressLabel.SetText(fmt.Sprintf("Installation failed: %v", err))
debug.Printf("Installation failed: %v", err)
log.Debugf("Installation failed: %v", err)
// Re-enable close button
fyne.DoAndWait(func() {

7
pkg/ui/variables.go
View File

@@ -28,9 +28,10 @@ var (
stopServiceButton *widget.Button
// Option checkboxes
metalHudCheckbox *widget.Check
showTerminalCheckbox *widget.Check
autoDeleteWdbCheckbox *widget.Check
metalHudCheckbox *widget.Check
showTerminalCheckbox *widget.Check
autoDeleteWdbCheckbox *widget.Check
advancedLoggingCheckbox *widget.Check
// Recommended settings button
applyRecommendedSettingsButton *widget.Button

6
pkg/utils/keychain.go
View File

@@ -1,8 +1,8 @@
package utils
import (
"epochsilicon/pkg/log"
"fmt"
"log"
"github.com/zalando/go-keyring"
)
@@ -23,7 +23,7 @@ func SaveSudoPassword(password string) error {
return fmt.Errorf("failed to save password to keychain: %v", err)
}
log.Println("Password saved securely to keychain")
log.Info("Password saved securely to keychain")
return nil
}
@@ -52,7 +52,7 @@ func DeleteSudoPassword() error {
return fmt.Errorf("failed to delete password from keychain: %v", err)
}
log.Println("Password removed from keychain")
log.Info("Password removed from keychain")
return nil
}

1
pkg/utils/prefs.go
View File

@@ -16,6 +16,7 @@ type UserPrefs struct {
RemapOptionAsAlt bool `json:"remap_option_as_alt"`
AutoDeleteWdb bool `json:"auto_delete_wdb"`
EnableMetalHud bool `json:"enable_metal_hud"`
AdvancedLogging bool `json:"advanced_logging"`
}
func getPrefsPath() (string, error) {

65
pkg/utils/utils.go
View File

@@ -2,6 +2,7 @@ package utils
import (
"encoding/json"
"epochsilicon/pkg/log"
"errors"
"fmt"
"io"
@@ -11,8 +12,6 @@ import (
"path/filepath"
"strings"
"epochsilicon/pkg/debug"
"fyne.io/fyne/v2"
"fyne.io/fyne/v2/dialog"
)
@@ -104,16 +103,16 @@ func CopyDir(src string, dst string) error {
// RunOsascript runs an AppleScript command using osascript.
func RunOsascript(scriptString string, myWindow fyne.Window) bool {
debug.Printf("Executing AppleScript: %s", scriptString)
log.Debugf("Executing AppleScript: %s", scriptString)
cmd := exec.Command("osascript", "-e", scriptString)
output, err := cmd.CombinedOutput()
if err != nil {
errMsg := fmt.Sprintf("AppleScript failed: %v\nOutput: %s", err, string(output))
dialog.ShowError(errors.New(errMsg), myWindow)
debug.Println(errMsg)
log.Debug(errMsg)
return false
}
debug.Printf("osascript output: %s", string(output))
log.Debugf("osascript output: %s", string(output))
return true
}
@@ -264,14 +263,14 @@ func InstallUpdate(dmgPath string) error {
}
// Mount the DMG and parse the mount point from plist output
debug.Printf("Mounting DMG: %s", dmgPath)
log.Debugf("Mounting DMG: %s", dmgPath)
mountCmd := exec.Command("hdiutil", "attach", dmgPath, "-nobrowse", "-plist")
mountOutput, err := mountCmd.CombinedOutput()
if err != nil {
return fmt.Errorf("failed to mount DMG: %v, output: %s", err, string(mountOutput))
}
debug.Printf("Mount output: %s", string(mountOutput))
log.Debugf("Mount output: %s", string(mountOutput))
mountPoint := ""
@@ -292,7 +291,7 @@ func InstallUpdate(dmgPath string) error {
end := strings.Index(nextLine, "</string>")
if start >= 8 && end > start {
mountPoint = nextLine[start:end]
debug.Printf("Found mount point in plist: %s", mountPoint)
log.Debugf("Found mount point in plist: %s", mountPoint)
break
}
}
@@ -301,7 +300,7 @@ func InstallUpdate(dmgPath string) error {
// Fallback: try without -plist flag for simpler output
if mountPoint == "" {
debug.Printf("Plist parsing failed, trying simple mount")
log.Debugf("Plist parsing failed, trying simple mount")
// Unmount first if something was mounted
exec.Command("hdiutil", "detach", dmgPath, "-force").Run()
@@ -321,7 +320,7 @@ func InstallUpdate(dmgPath string) error {
for i := len(parts) - 1; i >= 0; i-- {
if strings.HasPrefix(parts[i], "/Volumes/") {
mountPoint = parts[i]
debug.Printf("Found mount point in simple output: %s", mountPoint)
log.Debugf("Found mount point in simple output: %s", mountPoint)
break
}
}
@@ -336,11 +335,11 @@ func InstallUpdate(dmgPath string) error {
return fmt.Errorf("could not find mount point. Mount output: %s", string(mountOutput))
}
debug.Printf("Using mount point: %s", mountPoint)
log.Debugf("Using mount point: %s", mountPoint)
defer func() {
// Unmount the DMG
debug.Printf("Unmounting DMG from: %s", mountPoint)
log.Debugf("Unmounting DMG from: %s", mountPoint)
unmountCmd := exec.Command("hdiutil", "detach", mountPoint, "-force")
unmountCmd.Run()
}()
@@ -354,7 +353,7 @@ func InstallUpdate(dmgPath string) error {
newAppPath = exactPath
} else {
// Search for any .app bundle in the mount point
debug.Printf("EpochSilicon.app not found at exact path, searching for .app bundles")
log.Debugf("EpochSilicon.app not found at exact path, searching for .app bundles")
entries, err := os.ReadDir(mountPoint)
if err != nil {
return fmt.Errorf("failed to read DMG contents: %v", err)
@@ -363,7 +362,7 @@ func InstallUpdate(dmgPath string) error {
for _, entry := range entries {
if entry.IsDir() && strings.HasSuffix(entry.Name(), ".app") {
candidatePath := filepath.Join(mountPoint, entry.Name())
debug.Printf("Found .app bundle: %s", candidatePath)
log.Debugf("Found .app bundle: %s", candidatePath)
newAppPath = candidatePath
break
}
@@ -374,11 +373,11 @@ func InstallUpdate(dmgPath string) error {
return fmt.Errorf("no .app bundle found in DMG at %s", mountPoint)
}
debug.Printf("Found app to install: %s", newAppPath)
log.Debugf("Found app to install: %s", newAppPath)
// Create backup of current app
backupPath := currentAppPath + ".backup"
debug.Printf("Creating backup: %s -> %s", currentAppPath, backupPath)
log.Debugf("Creating backup: %s -> %s", currentAppPath, backupPath)
// Remove old backup if it exists
if PathExists(backupPath) {
@@ -390,16 +389,16 @@ func InstallUpdate(dmgPath string) error {
}
// Remove current app
debug.Printf("Removing current app: %s", currentAppPath)
log.Debugf("Removing current app: %s", currentAppPath)
if err := os.RemoveAll(currentAppPath); err != nil {
return fmt.Errorf("failed to remove current app: %v", err)
}
// Copy new app
debug.Printf("Installing new app: %s -> %s", newAppPath, currentAppPath)
log.Debugf("Installing new app: %s -> %s", newAppPath, currentAppPath)
if err := CopyDir(newAppPath, currentAppPath); err != nil {
// Try to restore backup on failure
debug.Printf("Installation failed, restoring backup")
log.Debugf("Installation failed, restoring backup")
os.RemoveAll(currentAppPath)
CopyDir(backupPath, currentAppPath)
return fmt.Errorf("failed to install new app: %v", err)
@@ -408,25 +407,25 @@ func InstallUpdate(dmgPath string) error {
// Fix executable permissions for the main binary
executablePath := filepath.Join(currentAppPath, "Contents", "MacOS", "epochsilicon")
if PathExists(executablePath) {
debug.Printf("Setting executable permissions for: %s", executablePath)
log.Debugf("Setting executable permissions for: %s", executablePath)
if err := os.Chmod(executablePath, 0755); err != nil {
debug.Printf("Warning: failed to set executable permissions: %v", err)
log.Debugf("Warning: failed to set executable permissions: %v", err)
// Don't fail the entire update for this, but log it
}
} else {
debug.Printf("Warning: executable not found at expected path: %s", executablePath)
log.Debugf("Warning: executable not found at expected path: %s", executablePath)
}
// Remove backup on success
os.RemoveAll(backupPath)
debug.Printf("Update installed successfully")
log.Debugf("Update installed successfully")
return nil
}
// TestDMGMount tests DMG mounting and returns mount point and app path for debugging
func TestDMGMount(dmgPath string) (string, string, error) {
debug.Printf("Testing DMG mount: %s", dmgPath)
log.Debugf("Testing DMG mount: %s", dmgPath)
// Mount the DMG with verbose output to better parse mount point
mountCmd := exec.Command("hdiutil", "attach", dmgPath, "-nobrowse", "-plist")
@@ -435,7 +434,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
return "", "", fmt.Errorf("failed to mount DMG: %v, output: %s", err, string(mountOutput))
}
debug.Printf("Mount output: %s", string(mountOutput))
log.Debugf("Mount output: %s", string(mountOutput))
// Parse mount output to get mount point
mountPoint := ""
@@ -460,7 +459,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
// Second try: use hdiutil info to get mount points if first method failed
if mountPoint == "" {
debug.Printf("First mount point detection failed, trying hdiutil info")
log.Debugf("First mount point detection failed, trying hdiutil info")
infoCmd := exec.Command("hdiutil", "info", "-plist")
infoOutput, infoErr := infoCmd.CombinedOutput()
if infoErr == nil {
@@ -481,7 +480,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
return "", "", fmt.Errorf("could not find mount point. Mount output: %s", string(mountOutput))
}
debug.Printf("Using mount point: %s", mountPoint)
log.Debugf("Using mount point: %s", mountPoint)
// Find the app in the mounted DMG
var newAppPath string
@@ -492,7 +491,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
newAppPath = exactPath
} else {
// Search for any .app bundle in the mount point
debug.Printf("EpochSilicon.app not found at exact path, searching for .app bundles")
log.Debugf("EpochSilicon.app not found at exact path, searching for .app bundles")
entries, err := os.ReadDir(mountPoint)
if err != nil {
// Unmount before returning error
@@ -503,7 +502,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
for _, entry := range entries {
if entry.IsDir() && strings.HasSuffix(entry.Name(), ".app") {
candidatePath := filepath.Join(mountPoint, entry.Name())
debug.Printf("Found .app bundle: %s", candidatePath)
log.Debugf("Found .app bundle: %s", candidatePath)
newAppPath = candidatePath
break
}
@@ -511,7 +510,7 @@ func TestDMGMount(dmgPath string) (string, string, error) {
}
// Unmount after testing
debug.Printf("Unmounting test DMG from: %s", mountPoint)
log.Debugf("Unmounting test DMG from: %s", mountPoint)
exec.Command("hdiutil", "detach", mountPoint, "-force").Run()
if newAppPath == "" {
@@ -531,14 +530,14 @@ func CompareFileWithBundledResource(filePath, resourceName string) bool {
// Get file info for the existing file
fileInfo, err := os.Stat(filePath)
if err != nil {
debug.Printf("Failed to stat file %s: %v", filePath, err)
log.Debugf("Failed to stat file %s: %v", filePath, err)
return false
}
// Load the bundled resource
resource, err := fyne.LoadResourceFromPath(resourceName)
if err != nil {
debug.Printf("Failed to load bundled resource %s: %v", resourceName, err)
log.Debugf("Failed to load bundled resource %s: %v", resourceName, err)
return false
}
@@ -546,7 +545,7 @@ func CompareFileWithBundledResource(filePath, resourceName string) bool {
fileSize := fileInfo.Size()
resourceSize := int64(len(resource.Content()))
debug.Printf("Comparing file sizes - %s: %d bytes vs bundled %s: %d bytes",
log.Debugf("Comparing file sizes - %s: %d bytes vs bundled %s: %d bytes",
filePath, fileSize, resourceName, resourceSize)
return fileSize == resourceSize

26
pkg/utils/wine_registry.go
View File

@@ -1,8 +1,8 @@
package utils
import (
"epochsilicon/pkg/log"
"fmt"
"log"
"os"
"os/exec"
"path/filepath"
@@ -74,7 +74,7 @@ reg add "%s" /v "RightOptionIsAlt" /t REG_SZ /d "Y" /f
return fmt.Errorf("batch registry add failed: %v, output: %s", err, string(output))
}
log.Printf("Successfully enabled Option-as-Alt mapping in Wine registry (optimized)")
log.Infof("Successfully enabled Option-as-Alt mapping in Wine registry (optimized)")
return nil
}
@@ -102,7 +102,7 @@ reg delete "%s" /v "RightOptionIsAlt" /f 2>nul
return fmt.Errorf("batch registry delete failed: %v, output: %s", err, string(output))
}
log.Printf("Successfully disabled Option-as-Alt mapping in Wine registry (optimized)")
log.Infof("Successfully disabled Option-as-Alt mapping in Wine registry (optimized)")
return nil
}
@@ -110,7 +110,7 @@ reg delete "%s" /v "RightOptionIsAlt" /f 2>nul
func CheckOptionAsAltEnabled() bool {
homeDir, err := os.UserHomeDir()
if err != nil {
log.Printf("Failed to get user home directory: %v", err)
log.Infof("Failed to get user home directory: %v", err)
return false
}
@@ -118,7 +118,7 @@ func CheckOptionAsAltEnabled() bool {
// Check if CrossOver wine loader exists
if !PathExists(wineLoaderPath) {
log.Printf("CrossOver wine loader not found at: %s", wineLoaderPath)
log.Infof("CrossOver wine loader not found at: %s", wineLoaderPath)
return false
}
@@ -133,18 +133,18 @@ func CheckOptionAsAltEnabled() bool {
func CheckOptionAsAltEnabledFast() bool {
regPath, err := GetWineUserRegPath()
if err != nil {
log.Printf("Failed to get Wine registry path: %v", err)
log.Infof("Failed to get Wine registry path: %v", err)
return false
}
if !PathExists(regPath) {
log.Printf("Wine user.reg file not found at: %s", regPath)
log.Infof("Wine user.reg file not found at: %s", regPath)
return false
}
content, err := os.ReadFile(regPath)
if err != nil {
log.Printf("Failed to read Wine registry file: %v", err)
log.Infof("Failed to read Wine registry file: %v", err)
return false
}
@@ -191,12 +191,12 @@ func SetOptionAsAltEnabled(enabled bool) error {
} else {
err := setRegistryValuesOptimized(winePrefix, false)
if err != nil {
log.Printf("Wine registry disable failed: %v", err)
log.Infof("Wine registry disable failed: %v", err)
}
err2 := setRegistryValuesFast(false)
if err2 != nil {
log.Printf("File-based cleanup failed: %v", err2)
log.Infof("File-based cleanup failed: %v", err2)
}
if err != nil {
@@ -334,7 +334,7 @@ func addOptionAsAltSettingsFast(regPath string, lines []string) error {
return fmt.Errorf("failed to write registry file: %v", err)
}
log.Printf("Successfully enabled Option-as-Alt mapping in Wine registry (fast method)")
log.Infof("Successfully enabled Option-as-Alt mapping in Wine registry (fast method)")
return nil
}
@@ -342,7 +342,7 @@ func addOptionAsAltSettingsFast(regPath string, lines []string) error {
func removeOptionAsAltSettingsFast(regPath string, lines []string) error {
if !PathExists(regPath) {
// File doesn't exist, nothing to remove
log.Printf("Successfully disabled Option-as-Alt mapping in Wine registry (no file to modify)")
log.Infof("Successfully disabled Option-as-Alt mapping in Wine registry (no file to modify)")
return nil
}
@@ -369,7 +369,7 @@ func removeOptionAsAltSettingsFast(regPath string, lines []string) error {
return fmt.Errorf("failed to write registry file: %v", err)
}
log.Printf("Successfully disabled Option-as-Alt mapping in Wine registry (fast method)")
log.Infof("Successfully disabled Option-as-Alt mapping in Wine registry (fast method)")
return nil
}