Small Cleanup on RatPackageManager, Now Can Disable Wine Log Instead …

…of "minimum"
KreitinnSoftware · Feb 6, 2025 · 11082b2 · 11082b2
1 parent 20f14ee
commit 11082b2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/app/src/main/java/com/micewine/emu/core/EnvVars.kt b/app/src/main/java/com/micewine/emu/core/EnvVars.kt
@@ -147,8 +147,8 @@ object EnvVars {
 
         vars.add("VKD3D_FEATURE_LEVEL=12_0")
 
-        if (wineLogLevel == "minimal") {
-            vars.add("WINEDEBUG=-fixme,-debug,-keyboard")
+        if (wineLogLevel == "disabled") {
+            vars.add("WINEDEBUG=-all")
         }
 
         vars.add("WINEESYNC=$wineESync")

diff --git a/app/src/main/java/com/micewine/emu/core/RatPackageManager.kt b/app/src/main/java/com/micewine/emu/core/RatPackageManager.kt
@@ -27,16 +27,8 @@ object RatPackageManager {
         ratPackage.ratFile.use { ratFile ->
             ratFile.isRunInThread = true
 
-            when (ratPackage.category) {
-                "VulkanDriver" -> {
-                    extractDir = "$ratPackagesDir/VulkanDriver-${java.util.UUID.randomUUID()}"
-                    File(extractDir!!).mkdirs()
-                }
-                "Box64" -> {
-                    extractDir = "$ratPackagesDir/Box64-${java.util.UUID.randomUUID()}"
-                    File(extractDir!!).mkdirs()
-                }
-            }
+            extractDir = "$ratPackagesDir/${ratPackage.category}-${java.util.UUID.randomUUID()}"
+            File(extractDir!!).mkdirs()
 
             ratFile.extractAll(extractDir)
 
@@ -58,32 +50,10 @@ object RatPackageManager {
             "rootfs" -> {
                 File("$extractDir/pkg-header").renameTo(File("$ratPackagesDir/rootfs-pkg-header"))
 
-                val builtInVulkanDrivers = File("$extractDir/builtInVulkanDrivers")
                 val vulkanDriversFolder = File("$extractDir/vulkanDrivers")
                 val box64Folder = File("$extractDir/box64")
 
-                if (builtInVulkanDrivers.exists()) {
-                    builtInVulkanDrivers.readLines().forEach { line ->
-                        val name = line.split(":")[0]
-                        val version = line.split(":")[1]
-                        val libPath = line.split(":")[2]
-                        val randUUID = java.util.UUID.randomUUID()
-
-                        File("$ratPackagesDir/VulkanDriver-$randUUID").mkdirs()
-                        File("$ratPackagesDir/VulkanDriver-$randUUID/pkg-header").apply {
-                            writeText("name=$name\n\nversion=$version\n\nvkDriverLib=$usrDir/lib/$libPath\n")
-                        }
-
-                        if (preferences.getString(SELECTED_DRIVER, "") == "") {
-                            preferences.edit().apply {
-                                putString(SELECTED_DRIVER, "VulkanDriver-$randUUID")
-                                apply()
-                            }
-                        }
-                    }
-
-                    builtInVulkanDrivers.delete()
-                } else if (vulkanDriversFolder.exists()) {
+                if (vulkanDriversFolder.exists()) {
                     vulkanDriversFolder.listFiles()?.sorted()?.forEach { ratFile ->
                         installRat(RatPackage(ratFile.path), context)
                     }

diff --git a/app/src/main/java/com/micewine/emu/fragments/WineSettingsFragment.kt b/app/src/main/java/com/micewine/emu/fragments/WineSettingsFragment.kt
@@ -51,7 +51,7 @@ class WineSettingsFragment : Fragment() {
         addToAdapter(R.string.wine_esync_title, R.string.null_description, null, SWITCH, WINE_ESYNC_DEFAULT_VALUE, WINE_ESYNC)
         addToAdapter(R.string.enable_wine_services_title, R.string.null_description, null, SWITCH, ENABLE_SERVICES_DEFAULT_VALUE, ENABLE_SERVICES)
         addToAdapter(R.string.cpu_affinity_title, R.string.null_description, availableCPUs, CHECKBOX, availableCPUs.joinToString(","), CPU_AFFINITY)
-        addToAdapter(R.string.wine_log_level_title, R.string.null_description, arrayOf("minimal", "default"), SPINNER, WINE_LOG_LEVEL_DEFAULT_VALUE, WINE_LOG_LEVEL)
+        addToAdapter(R.string.wine_log_level_title, R.string.null_description, arrayOf("disabled", "default"), SPINNER, WINE_LOG_LEVEL_DEFAULT_VALUE, WINE_LOG_LEVEL)
     }
 
     private fun addToAdapter(titleId: Int, descriptionId: Int, valuesArray: Array<String>?, type: Int, defaultValue: Any, keyId: String) {