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

change to zerolog

Browse Source
This commit is contained in:
Evan Burkey
2025-07-23 08:46:53 -07:00
parent 71f044e6e0
commit 8b5be228fe
17 changed files with 223 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/utils/wine_registry.go
View File

@@ -2,7 +2,7 @@ package utils
import (
"fmt"
"log"
"github.com/rs/zerolog/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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("Wine registry disable failed: %v", err)
}
err2 := setRegistryValuesFast(false)
if err2 != nil {
log.Printf("File-based cleanup failed: %v", err2)
log.Info().Msgf("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.Info().Msgf("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.Info().Msgf("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.Info().Msgf("Successfully disabled Option-as-Alt mapping in Wine registry (fast method)")
return nil
}