Compare commits
	
		
			9 Commits
		
	
	
		
			0.0.1
			...
			087923a13f
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 087923a13f | |||
| a1f46438d0 | |||
| 8b5be228fe | |||
| 71f044e6e0 | |||
| f77326d5d8 | |||
| 3ec95ac297 | |||
| e00a98dc88 | |||
| ce21edeb5e | |||
| cbbc36ec03 | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,7 @@ | ||||
| .DS_Store | ||||
| EpochSilicon.* | ||||
| EpochSilicon.app/Contents/MacOS/epochsilicon | ||||
| /EpochSilicon.app | ||||
| *.dmg | ||||
| epochsilicon | ||||
| .idea | ||||
| @@ -1,34 +0,0 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||||
| <plist version="1.0"> | ||||
| <dict> | ||||
| 	<key>CFBundleName</key> | ||||
| 	<string>EpochSilicon</string> | ||||
| 	<key>CFBundleExecutable</key> | ||||
| 	<string>epochsilicon</string> | ||||
| 	<key>CFBundleIdentifier</key> | ||||
| 	<string>com.burkey.epochsilicon</string> | ||||
| 	<key>CFBundleIconFile</key> | ||||
| 	<string>icon.icns</string> | ||||
| 	<key>CFBundleShortVersionString</key> | ||||
| 	<string>1.2.4</string> | ||||
| 	<key>CFBundleSupportedPlatforms</key> | ||||
| 	<array> | ||||
| 		<string>MacOSX</string> | ||||
| 	</array> | ||||
| 	<key>CFBundleVersion</key> | ||||
| 	<string>133</string> | ||||
| 	<key>NSHighResolutionCapable</key> | ||||
| 	<true/> | ||||
| 	<key>NSSupportsAutomaticGraphicsSwitching</key> | ||||
| 	<true/> | ||||
| 	<key>CFBundleInfoDictionaryVersion</key> | ||||
| 	<string>6.0</string> | ||||
| 	<key>CFBundlePackageType</key> | ||||
| 	<string>APPL</string> | ||||
| 	<key>LSApplicationCategoryType</key> | ||||
| 	<string>public.app-category.</string> | ||||
| 	<key>LSMinimumSystemVersion</key> | ||||
| 	<string>10.11</string> | ||||
| </dict> | ||||
| </plist> | ||||
										
											Binary file not shown.
										
									
								
							| @@ -2,5 +2,5 @@ | ||||
|   Icon = "Icon.png" | ||||
|   Name = "EpochSilicon" | ||||
|   ID = "com.burkey.epochsilicon" | ||||
|   Version = "1.2.4" | ||||
|   Build = 134 | ||||
|   Version = "1.0.0" | ||||
|   Build = 4 | ||||
|   | ||||
							
								
								
									
										117
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										117
									
								
								README.md
									
									
									
									
									
								
							| @@ -1,24 +1,9 @@ | ||||
| # Epoch Silicon | ||||
|  | ||||
|  | ||||
|  | ||||
| A user-friendly launcher for Project Epoch on Apple Silicon Macs, with one-click patching of winerosetta, rosettax87 and d9vk. | ||||
|  | ||||
| ## Prerequisites | ||||
|  | ||||
| Before you begin, ensure you have the following: | ||||
|  | ||||
| * A working version of **CrossOver** installed (the trial version is sufficient and can still be used after expiration). | ||||
|   - You must use CrossOver v25.0.1 or later. Older versions will cause issues. | ||||
| * A 3.3.5a World of Warcraft client. You can easily get the client from [Project Epoch's download page](https://project-epoch.com/play) | ||||
| * Place the client in an folder you have rights to. Your user directory (example: `/Users/username/Epoch`) is a good default choice. Avoid spaces in your path! | ||||
|  | ||||
| ## Credits | ||||
|  | ||||
| All credit for the core translation layer `winerosetta` and `rosettax87` goes to [**@Lifeisawful**](https://github.com/Lifeisawful). This application is merely a Fyne-based GUI wrapper to simplify the patching and launching process.  | ||||
|  | ||||
| [https://github.com/Lifeisawful/winerosetta](https://github.com/Lifeisawful/winerosetta)  | ||||
|  | ||||
| [https://github.com/Lifeisawful/rosettax87](https://github.com/Lifeisawful/rosettax87) | ||||
|  | ||||
| EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), credit for the base of the application goes to tairasu. | ||||
|  | ||||
| ## Features | ||||
|  | ||||
| *   **Apple Silicon Compatibility:** Runs 32-bit DirectX9 World of Warcraft (v3.3.5a) on M1/M2/M3/M4 Macs without "illegal instruction" errors. | ||||
| @@ -29,15 +14,31 @@ EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), cre | ||||
| *   **Automated Setup:** One-click patching for both CrossOver and Epoch installations. | ||||
| *   **Simple Interface:** Easy to use GUI with status indicators and configuration options. | ||||
|  | ||||
| ## Known Issues | ||||
|  | ||||
| - For one tester, it took up to a minute for Wow to start after hitting the "Play" button. This is currently being investigated. | ||||
|   | ||||
| ## Usage | ||||
|  | ||||
| ### Prerequisites | ||||
|  | ||||
| Before you begin, ensure you have the following: | ||||
|  | ||||
| * A working version of [CrossOver](https://www.codeweavers.com/crossover) installed (the trial version is sufficient and can still be used after expiration). | ||||
|     - You must use CrossOver v25.0.1 or later. Older versions will cause issues. | ||||
| * A 3.3.5a World of Warcraft client. You can download the client from [Project Epoch's download page](https://project-epoch.com/play) | ||||
| * Place the client in a folder you have rights to. Your user directory (example: `/Users/username/Epoch`) is a good default choice. Avoid spaces in your path! | ||||
|  | ||||
| ### Installation | ||||
|  | ||||
| 1. [Click here to download the latest release](https://git.burkey.co/eburk/EpochSilicon/releases/download/latest/EpochSilicon.dmg). | ||||
| 2. Double-click `EpochSilicon.dmg`. | ||||
| 3. Drag `EpochSilicon` into `Applications`. You may now close and eject the disk image. | ||||
| 4. Run `EpochSilicon` like you would any other application using Launchpad, Shortcut, etc. | ||||
|  | ||||
| ### Setup | ||||
|  | ||||
| ### Method 1: Using the Pre-built Application | ||||
|  | ||||
| 1.  Launch `EpochSilicon.app`. | ||||
| 1.  Launch `EpochSilicon`. | ||||
| 2.  **Set CrossOver Path**: | ||||
|     *   If CrossOver is installed in the default location (`/Applications/CrossOver.app`), this path will be pre-filled. | ||||
|     *   Otherwise, click "Set/Change" and navigate to your `CrossOver.app` bundle. | ||||
| @@ -48,7 +49,7 @@ EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), cre | ||||
|     *   Click "Patch CrossOver". | ||||
|     *   Status indicators will turn green once patching is successful for each. | ||||
| 6.  **Start RosettaX87 Service**: | ||||
|     *   Click "Start RosettaX87 Service" and enter your sudo password when prompted. | ||||
|     *   Click "Start Service" and enter your sudo password when prompted. | ||||
|     *   This will run the RosettaX87 service in the background and is required for launching the game. | ||||
|     *   The service will automatically stop when you close the launcher. | ||||
| 7.  **Configure Options (Optional)**: | ||||
| @@ -58,7 +59,27 @@ EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), cre | ||||
|     *   Once both paths are set, both components are patched, and the RosettaX87 service is running, the "Launch Game" button will become active. Click it. | ||||
| 9.  **Enjoy**: Experience a VM free, smoother Project Epoch on your Apple Silicon Mac! | ||||
|  | ||||
| ### Method 2: Running from Source Code | ||||
| ## Troubleshooting / FAQ | ||||
|  | ||||
| ### The Patch Epoch step is taking forever | ||||
|  | ||||
| The initial patch download is quite large and can take a while if your internet is slow. The app will tell you when it's done. | ||||
|  | ||||
| ### My resolution is super blown up and I can't see the whole screen | ||||
|  | ||||
| Wine does that on first launch if you have a large widescreen monitor. | ||||
| 1. Hit Escape to close the game  | ||||
| 2. Open your `Config.wtf` file in a text editor, it is located in your wow game directory at `/WTF/Config.wtf` | ||||
| 3. Add your desired resolution. I have a 3440x1440 monitor so I added the following to my `Config.WTF` | ||||
| ``` | ||||
| SET gxResolution "3440x1440" | ||||
| ``` | ||||
|  | ||||
| ### When I change graphics settings, all the buttons have big white boxes around them | ||||
|  | ||||
| This is another common wine issue, just close the game normally and it should be fixed on next startup | ||||
|  | ||||
| ## Running from Source Code | ||||
|  | ||||
| If you prefer to run the application directly from source code: | ||||
|  | ||||
| @@ -77,7 +98,7 @@ If you prefer to run the application directly from source code: | ||||
|     go run main.go | ||||
|     ``` | ||||
|      | ||||
|     Note: This method requires Go to be installed on your system. See the Build Instructions section for details on installing Go and Fyne. | ||||
|     Note: This method requires Go and Fyne to be installed on your system. | ||||
|  | ||||
| 4.  **Use the application** as described in Method 1 (steps 2-6). | ||||
|  | ||||
| @@ -85,41 +106,6 @@ If you prefer to run the application directly from source code: | ||||
|  | ||||
| TBD | ||||
|  | ||||
| ## Build Instructions | ||||
|  | ||||
| To build this application yourself, you will need: | ||||
|  | ||||
| 1.  **Go**: Make sure you have Go installed on your system. You can download it from [golang.org](https://golang.org/). | ||||
| 2.  **Fyne**: Install the Fyne toolkit and its dependencies by following the instructions on the [Fyne website](https://developer.fyne.io/started/). | ||||
|  | ||||
| Once Go and Fyne are set up, navigate to the project directory in your terminal and run the following command to build the application for Apple Silicon (ARM64) macOS: | ||||
|  | ||||
| ### Option 1: Using the Makefile (Recommended) | ||||
|  | ||||
| The included Makefile automates the build process and handles copying the required resource files: | ||||
|  | ||||
| ```sh | ||||
| make | ||||
| ``` | ||||
|  | ||||
| This will: | ||||
| 1. Build the application for Apple Silicon macOS | ||||
| 2. Automatically copy the rosettax87 and winerosetta directories to the app bundle | ||||
|  | ||||
| ### Option 2: Manual Build | ||||
|  | ||||
| If you prefer to build manually: | ||||
|  | ||||
| ```sh | ||||
| GOOS=darwin GOARCH=arm64 fyne package | ||||
| # Then manually copy the resource directories | ||||
| cp -R rosettax87 winerosetta EpochSilicon.app/Contents/Resources/ | ||||
| ``` | ||||
|  | ||||
| In either case, this will create a `EpochSilicon.app` file in the project directory, which you can then run. | ||||
|  | ||||
| Make sure you have an `Icon.png` file in the root of the project directory before building. | ||||
|  | ||||
| ## Bundled Binaries | ||||
|  | ||||
| The `rosettax87` and `winerosetta` components included in this application are precompiled for convenience. If you prefer, you can compile them yourself by following the instructions provided by Lifeisawful on the official repositories:  | ||||
| @@ -129,3 +115,14 @@ The `rosettax87` and `winerosetta` components included in this application are p | ||||
| ## License | ||||
|  | ||||
| This project is licensed under the MIT License. | ||||
|  | ||||
| ## Credits | ||||
|  | ||||
| All credit for the core translation layer `winerosetta` and `rosettax87` goes to [**@Lifeisawful**](https://github.com/Lifeisawful). This application is merely a Fyne-based GUI wrapper to simplify the patching and launching process. | ||||
|  | ||||
| [https://github.com/Lifeisawful/winerosetta](https://github.com/Lifeisawful/winerosetta) | ||||
|  | ||||
| [https://github.com/Lifeisawful/rosettax87](https://github.com/Lifeisawful/rosettax87) | ||||
|  | ||||
| EpochSilicon is a fork of [https://turtlesilicon.github.io/](TurtleSilicon), credit for the base of the application goes to tairasu. | ||||
|  | ||||
|   | ||||
							
								
								
									
										3
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								go.mod
									
									
									
									
									
								
							| @@ -33,9 +33,12 @@ require ( | ||||
| 	github.com/jeandeaual/go-locale v0.0.0-20250612000132-0ef82f21eade // indirect | ||||
| 	github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 // indirect | ||||
| 	github.com/kr/text v0.2.0 // indirect | ||||
| 	github.com/mattn/go-colorable v0.1.14 // indirect | ||||
| 	github.com/mattn/go-isatty v0.0.20 // indirect | ||||
| 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect | ||||
| 	github.com/nicksnyder/go-i18n/v2 v2.6.0 // indirect | ||||
| 	github.com/pmezard/go-difflib v1.0.0 // indirect | ||||
| 	github.com/rs/zerolog v1.34.0 // indirect | ||||
| 	github.com/rymdport/portal v0.4.2 // indirect | ||||
| 	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect | ||||
| 	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect | ||||
|   | ||||
							
								
								
									
										23
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								go.sum
									
									
									
									
									
								
							| @@ -16,9 +16,11 @@ 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= | ||||
| github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= | ||||
| github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= | ||||
| github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= | ||||
| github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0= | ||||
| github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8= | ||||
| github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= | ||||
| github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= | ||||
| github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= | ||||
| @@ -55,6 +57,7 @@ github.com/go-text/typesetting v0.3.0 h1:OWCgYpp8njoxSRpwrdd1bQOxdjOXDj9Rqart9ML | ||||
| github.com/go-text/typesetting v0.3.0/go.mod h1:qjZLkhRgOEYMhU9eHBr3AR4sfnGJvOXNLt8yRAySFuY= | ||||
| github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066 h1:qCuYC+94v2xrb1PoS4NIDe7DGYtLnU2wWiQe9a1B1c0= | ||||
| github.com/go-text/typesetting-utils v0.0.0-20241103174707-87a29e9e6066/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= | ||||
| github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||||
| github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= | ||||
| github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= | ||||
| github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= | ||||
| @@ -76,6 +79,13 @@ github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25 h1:YLvr1eE6cdCqjOe9 | ||||
| github.com/jsummers/gobmp v0.0.0-20230614200233-a9de23ed2e25/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= | ||||
| github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= | ||||
| github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= | ||||
| github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= | ||||
| github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= | ||||
| github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= | ||||
| github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= | ||||
| github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||||
| github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= | ||||
| github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||||
| github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= | ||||
| github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= | ||||
| github.com/nicksnyder/go-i18n/v2 v2.5.1 h1:IxtPxYsR9Gp60cGXjfuR/llTqV8aYMsC472zD0D1vHk= | ||||
| @@ -84,20 +94,28 @@ github.com/nicksnyder/go-i18n/v2 v2.6.0 h1:C/m2NNWNiTB6SK4Ao8df5EWm3JETSTIGNXBpM | ||||
| github.com/nicksnyder/go-i18n/v2 v2.6.0/go.mod h1:88sRqr0C6OPyJn0/KRNaEz1uWorjxIKP7rUUcvycecE= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= | ||||
| github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= | ||||
| github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= | ||||
| github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= | ||||
| github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= | ||||
| github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= | ||||
| github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= | ||||
| github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= | ||||
| github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= | ||||
| github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= | ||||
| github.com/rymdport/portal v0.4.1 h1:2dnZhjf5uEaeDjeF/yBIeeRo6pNI2QAKm7kq1w/kbnA= | ||||
| github.com/rymdport/portal v0.4.1/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= | ||||
| github.com/rymdport/portal v0.4.2 h1:7jKRSemwlTyVHHrTGgQg7gmNPJs88xkbKcIL3NlcmSU= | ||||
| github.com/rymdport/portal v0.4.2/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= | ||||
| github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= | ||||
| github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= | ||||
| github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= | ||||
| github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= | ||||
| github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= | ||||
| github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= | ||||
| github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= | ||||
| github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= | ||||
| github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= | ||||
| github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= | ||||
| github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= | ||||
| github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= | ||||
| github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= | ||||
| @@ -114,6 +132,10 @@ golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= | ||||
| golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= | ||||
| golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs= | ||||
| golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8= | ||||
| golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||||
| golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= | ||||
| golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= | ||||
| golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= | ||||
| @@ -126,6 +148,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= | ||||
| gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg= | ||||
| gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||
| howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM= | ||||
|   | ||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 210 KiB | 
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 167 KiB | 
							
								
								
									
										23
									
								
								main.go
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								main.go
									
									
									
									
									
								
							| @@ -1,57 +1,58 @@ | ||||
| package main | ||||
|  | ||||
| import ( | ||||
| 	"epochsilicon/pkg/debug" | ||||
| 	"epochsilicon/pkg/log" | ||||
| 	"epochsilicon/pkg/service" | ||||
| 	"epochsilicon/pkg/ui" | ||||
| 	"epochsilicon/pkg/utils" | ||||
| 	"fyne.io/fyne/v2" | ||||
| 	"fyne.io/fyne/v2/app" | ||||
| 	"strings" | ||||
| ) | ||||
|  | ||||
| const appVersion = "0.1.0" | ||||
| const appVersion = "1.0.1" | ||||
|  | ||||
| func main() { | ||||
| 	log.SetupLogging() | ||||
| 	defer log.Close() | ||||
|  | ||||
| 	PEApp := app.NewWithID("com.burkey.epochsilicon") | ||||
| 	PEWindow := PEApp.NewWindow("EpochSilicon v" + appVersion) | ||||
| 	PEWindow.Resize(fyne.NewSize(650, 500)) | ||||
| 	PEWindow.SetFixedSize(true) | ||||
|  | ||||
| 	/* Check for updates | ||||
| 	// TODO: Fix updating | ||||
| 	go func() { | ||||
| 		prefs, _ := utils.LoadPrefs() | ||||
| 		updateInfo, updateAvailable, err := utils.CheckForUpdateWithAssets(appVersion) | ||||
| 		if err != nil { | ||||
| 			debug.Printf("Failed to check for updates: %v", err) | ||||
| 			log.Debugf("Failed to check for updates: %v", err) | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		if !updateAvailable { | ||||
| 			debug.Printf("No updates available") | ||||
| 			log.Debugf("No updates available") | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		latestVersion := strings.TrimPrefix(updateInfo.TagName, "v") | ||||
| 		debug.Printf("Update available: current=%s, latest=%s", appVersion, latestVersion) | ||||
| 		log.Debugf("Update available: current=%s, latest=%s", appVersion, latestVersion) | ||||
|  | ||||
| 		// Skip if user has suppressed this version | ||||
| 		if prefs.SuppressedUpdateVersion == latestVersion { | ||||
| 			debug.Printf("Update suppressed by user: %s", latestVersion) | ||||
| 			log.Debugf("Update suppressed by user: %s", latestVersion) | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
|  | ||||
| 		// Show enhanced update dialog | ||||
| 		ui.ShowUpdateDialog(updateInfo, appVersion, PEWindow) | ||||
| 	}() | ||||
| 	*/ | ||||
|  | ||||
| 	content := ui.CreateUI(PEWindow) | ||||
| 	PEWindow.SetContent(content) | ||||
|  | ||||
| 	// Set up cleanup when window closes | ||||
| 	PEWindow.SetCloseIntercept(func() { | ||||
| 		debug.Println("Application closing, cleaning up RosettaX87 service...") | ||||
| 		log.Debug("Application closing, cleaning up RosettaX87 service...") | ||||
| 		service.CleanupService() | ||||
| 		PEApp.Quit() | ||||
| 	}) | ||||
|   | ||||
| @@ -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...) | ||||
| } | ||||
| @@ -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 | ||||
| } | ||||
| @@ -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 | ||||
|  | ||||
| @@ -41,7 +41,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 +71,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.Debugf("GAME STDOUT: %s", line) | ||||
| 		} | ||||
| 	}() | ||||
|  | ||||
| @@ -79,7 +79,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.Debugf("GAME STDERR: %s", line) | ||||
| 		} | ||||
| 	}() | ||||
|  | ||||
| @@ -93,9 +93,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 +103,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 +132,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 +163,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) | ||||
| @@ -209,21 +209,21 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) { | ||||
| 		escapedShellCmd := utils.EscapeStringForAppleScript(shellCmd) | ||||
| 		cmd2Script := fmt.Sprintf("tell application \"Terminal\" to do script \"%s\"", escapedShellCmd) | ||||
|  | ||||
| 		debug.Println("Executing WoW launch command via AppleScript...") | ||||
| 		log.Debug("Executing WoW launch command via AppleScript...") | ||||
| 		if !utils.RunOsascript(cmd2Script, myWindow) { | ||||
| 			return | ||||
| 		} | ||||
|  | ||||
| 		debug.Println("Launch command executed. Check the new terminal window.") | ||||
| 		log.Debug("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...") | ||||
| 		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 | ||||
| 		} | ||||
| 		debug.Println("Game launched with integrated terminal. Check the application logs for output.") | ||||
| 		log.Debug("Game launched with integrated terminal. Check the application logs for output.") | ||||
| 	} | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
							
								
								
									
										90
									
								
								pkg/log/logging.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								pkg/log/logging.go
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,90 @@ | ||||
| package log | ||||
|  | ||||
| import ( | ||||
| 	"github.com/rs/zerolog" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| ) | ||||
|  | ||||
| const ApplicationSupportDir = "/Library/Application Support/EpochSilicon" | ||||
|  | ||||
| var ( | ||||
| 	logger         zerolog.Logger | ||||
| 	logFilePointer *os.File | ||||
| 	logFilePath    = filepath.Join(ApplicationSupportDir, "EpochSilicon.log") | ||||
| ) | ||||
|  | ||||
| func SetupLogging() { | ||||
| 	logFilePointer = nil | ||||
| 	ToConsole(zerolog.InfoLevel) | ||||
| } | ||||
|  | ||||
| func Close() { | ||||
| 	if logFilePointer != nil { | ||||
| 		logFilePointer.Close() | ||||
| 	} | ||||
| } | ||||
|  | ||||
| func ToFile(level zerolog.Level) { | ||||
| 	Close() | ||||
| 	var err error | ||||
| 	logFilePointer, err = os.OpenFile(logFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666) | ||||
| 	if err != nil { | ||||
| 		logger.Error().Msg(err.Error()) | ||||
| 		return | ||||
| 	} | ||||
| 	logger = zerolog.New(logFilePointer).With().Timestamp().Logger().Level(level) | ||||
| } | ||||
|  | ||||
| func ToConsole(level zerolog.Level) { | ||||
| 	Close() | ||||
| 	logger = zerolog.New(os.Stdout).With().Timestamp().Logger().Level(level) | ||||
| } | ||||
|  | ||||
| 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...) | ||||
| } | ||||
| @@ -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,20 +186,20 @@ 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) | ||||
| @@ -213,10 +212,10 @@ func PatchEpoch(myWindow fyne.Window, updateAllStatuses func()) { | ||||
| 				dialog.ShowError(errors.New(errMsg), myWindow) | ||||
| 			}) | ||||
| 			paths.DownloadingPatches = false | ||||
| 			log.Println(errMsg) | ||||
| 			log.Error(errMsg) | ||||
| 		} | ||||
| 		log.Printf("Successfully updated %d Epoch files", stats.Updated) | ||||
| 		debug.Println("Epoch patching with bundled resources completed successfully.") | ||||
| 		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) | ||||
| 		}) | ||||
| @@ -229,7 +228,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 +245,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 +257,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 +304,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 +318,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 +352,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 +375,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 +406,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 +427,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 | ||||
|   | ||||
| @@ -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) | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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,7 +37,7 @@ 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) | ||||
|  | ||||
| @@ -47,7 +47,7 @@ func createOptionsComponents() { | ||||
| 		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 +69,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 +126,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 +198,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 +206,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 +240,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 +248,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 | ||||
|   | ||||
| @@ -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 | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| package ui | ||||
|  | ||||
| import ( | ||||
| 	"epochsilicon/pkg/debug" | ||||
| 	"epochsilicon/pkg/log" | ||||
| 	"git.burkey.co/eburk/epochcli/pkg/epoch" | ||||
| 	"os" | ||||
| 	"path/filepath" | ||||
| @@ -110,10 +110,10 @@ func updateEpochStatus() { | ||||
| 		epochPatchesApplied := false | ||||
| 		stats, err := epoch.Update(paths.EpochPath, false, true, true) | ||||
| 		if err != nil { | ||||
| 			debug.Printf("Failed to get download Epoch patches: %v", err) | ||||
| 			log.Debugf("Failed to get download Epoch patches: %v", err) | ||||
| 		} | ||||
| 		if stats.Outdated == 0 { | ||||
| 			debug.Println("Nothing is outdated") | ||||
| 			log.Debug("Nothing is outdated") | ||||
| 			epochPatchesApplied = true | ||||
| 		} | ||||
|  | ||||
|   | ||||
| @@ -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{ | ||||
| @@ -114,24 +114,30 @@ func ShowUpdateDialog(updateInfo *utils.UpdateInfo, currentVersion string, myWin | ||||
| 				return | ||||
| 			} | ||||
|  | ||||
| 			progressLabel.SetText("Installing update...") | ||||
| 			progressBar.SetValue(1.0) | ||||
| 			fyne.DoAndWait(func() { | ||||
| 				progressLabel.SetText("Installing update...") | ||||
| 				progressBar.SetValue(1.0) | ||||
| 			}) | ||||
|  | ||||
| 			// Install update | ||||
| 			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 | ||||
| 				d.SetButtons([]fyne.CanvasObject{ | ||||
| 					widget.NewButton("Close", func() { d.Hide() }), | ||||
| 				fyne.DoAndWait(func() { | ||||
| 					d.SetButtons([]fyne.CanvasObject{ | ||||
| 						widget.NewButton("Close", func() { d.Hide() }), | ||||
| 					}) | ||||
| 				}) | ||||
| 				return | ||||
| 			} | ||||
|  | ||||
| 			// Success - show restart dialog | ||||
| 			progressLabel.SetText("Update installed successfully!") | ||||
| 			fyne.DoAndWait(func() { | ||||
| 				progressLabel.SetText("Update installed successfully!") | ||||
| 			}) | ||||
|  | ||||
| 			restartDialog := dialog.NewConfirm( | ||||
| 				"Update Complete", | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|  | ||||
| @@ -163,7 +162,7 @@ type Asset struct { | ||||
|  | ||||
| // CheckForUpdateWithAssets returns update information including download assets | ||||
| func CheckForUpdateWithAssets(currentVersion string) (*UpdateInfo, bool, error) { | ||||
| 	resp, err := http.Get("https://api.github.com/repos/tairasu/EpochSilicon/releases/latest") | ||||
| 	resp, err := http.Get("https://git.burkey.co/api/v1/repos/eburk/epochsilicon/releases/latest") | ||||
| 	if err != nil { | ||||
| 		return nil, false, err | ||||
| 	} | ||||
| @@ -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 | ||||
|   | ||||
| @@ -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 | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user