diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt index 71eb791985..aa0a76cb25 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageScan.kt @@ -19,7 +19,7 @@ enum class Bucket { GAMES, GAME_DATA, TOOLS, COMPONENTS, STORES, DESKTOP, SYSTEM class GameUsage( val appId: Int, val name: String, val art: File?, val library: String, val internal: Boolean, val lastPlayed: Long, val game: Long, val prefix: Long, val shaders: Long, val workshop: Long, val shaderDir: File?, - val x64: Boolean = false, + val x64: Boolean = false, val prefixDir: File? = null, ) { val data: Long get() = prefix + shaders + workshop val total: Long get() = game + data @@ -175,14 +175,16 @@ object StorageScan { } if (!m.installed) continue val gameBytes = dir?.let { File(lib.root, "steamapps/common/$it") }?.takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 - val prefix = File(lib.data, "steamapps/compatdata/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 + val compatRoot = File(lib.data, "steamapps/compatdata").takeIf { it.isDirectory } ?: File(lib.root, "steamapps/compatdata") + val prefixDir = File(compatRoot, m.appId.toString()).takeIf { it.isDirectory } + val prefix = prefixDir?.let { walker.measure(it) } ?: 0 val shaderDir = File(lib.data, "steamapps/shadercache/${m.appId}").takeIf { it.isDirectory } val shaders = shaderDir?.let { walker.measure(it) } ?: 0 val workshop = File(lib.root, "steamapps/workshop/content/${m.appId}").takeIf { it.isDirectory }?.let { walker.measure(it) } ?: 0 val known = art[lib.x64]?.get(m.appId) games.add(GameUsage( m.appId, known?.name ?: m.name, known?.art, lib.label, lib.internal, m.lastPlayed, - gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, + gameBytes, prefix, shaders, workshop, shaderDir, lib.x64, prefixDir, )) } } diff --git a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt index 0724dd8dd2..f7086336ec 100644 --- a/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt +++ b/app/src/main/java/com/droiddeck/launcher/storage/StorageState.kt @@ -140,6 +140,13 @@ object StorageState { FileOps.delete(dir) }) + fun resetPrefix(context: Context, game: GameUsage) = act(context, "prefix-${game.appId}", { _, fresh -> + val dir = fresh.games.firstOrNull { it.appId == game.appId && it.x64 == game.x64 && it.prefixDir?.path == game.prefixDir?.path } + ?.prefixDir ?: error("prefix not found") + check(FileOps.delete(dir)) { "cannot delete $dir" } + true + }) + fun removeLeftover(context: Context, l: Leftover) = act(context, "leftover-${l.appId}", { _, fresh -> val leftover = fresh.leftovers.firstOrNull { it.appId == l.appId && it.prefix?.path == l.prefix?.path && it.shaders?.path == l.shaders?.path } ?: return@act false diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt index badd3f1f4d..452443eebd 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoragePage.kt @@ -846,17 +846,23 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: val ctx = LocalContext.current val busy = sessionRunning || StorageState.cleaning var confirm by remember { mutableStateOf(null) } + var confirmPrefix by remember { mutableStateOf(null) } SubHeader(stringResource(R.string.storage_game_data), stringResource(R.string.storage_game_data_hint, gb(report.prefixes), gb(report.workshop), gb(report.shaders)), onBack) ActionStatus() if (sessionRunning) { Note(stringResource(R.string.storage_session_running)); Spacer(Modifier.height(4.dp)) } - val games = report.games.filter { it.data >= ONE_MB }.sortedByDescending { it.data } + val games = report.games.filter { it.data >= ONE_MB || it.prefixDir != null }.sortedByDescending { it.data } SectionTitle(stringResource(R.string.storage_data_installed), gb(games.sumOf { it.data })) ListCard { if (games.isEmpty()) Text(stringResource(R.string.storage_no_games), fontSize = 14.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, modifier = Modifier.padding(16.dp)) games.forEachIndexed { i, g -> ItemRow( gameName(g), stringResource(R.string.storage_data_parts, gb(g.prefix), gb(g.shaders), gb(g.workshop)), g.data, i == games.lastIndex, - action = { SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } }, + action = { + Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) { + SecondaryButton(stringResource(R.string.storage_clear_shaders), compact = true, enabled = !busy && g.shaders >= ONE_MB) { StorageState.clearShaders(ctx, g.appId, g.x64) } + SecondaryButton(stringResource(R.string.storage_reset_prefix), compact = true, enabled = !busy && g.prefixDir != null) { confirmPrefix = g } + } + }, ) } } @@ -888,6 +894,13 @@ private fun GameDataView(report: StorageReport, sessionRunning: Boolean, onBack: SectionTitle(stringResource(R.string.storage_data_other), null) ListCard { ItemRow(stringResource(R.string.storage_data_other_title), stringResource(R.string.storage_data_other_detail), report.otherPrefixes, true) } } + confirmPrefix?.let { g -> + ConfirmDialog( + stringResource(R.string.storage_reset_prefix_title, gameName(g)), + stringResource(R.string.storage_reset_prefix_confirm, gb(g.prefix), g.library), stringResource(R.string.storage_reset_prefix), + onConfirm = { StorageState.resetPrefix(ctx, g) }, onDismiss = { confirmPrefix = null }, + ) + } confirm?.let { l -> ConfirmDialog( stringResource(R.string.storage_remove_title, stringResource(R.string.storage_steam_app, l.appId)), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 08e824a50f..bb9f8061b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2961,6 +2961,9 @@ Installed games Prefix %1$s · shaders %2$s · workshop %3$s Clear shaders + Reset prefix + Reset prefix for %1$s? + Deletes its Wine prefix (%1$s) in %2$s and recreates it on the next launch. Saves, settings and installed redistributables inside it are lost; Steam Cloud saves stay in your account. Uninstalled games Steam app %1$d Its prefix still holds files, which can include local saves