diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt index 8acbbe18b0..7cc8051774 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/Library.kt @@ -222,16 +222,7 @@ object Library { internal fun concealedSteamApps(root: File): Set { val config = AddedGames.accountConfig(root) ?: return emptySet() - val hidden = runCatching { - val entries = org.json.JSONArray(File(config, "cloudstorage/cloud-storage-namespace-1.json").readText()) - val entry = (0 until entries.length()).map { entries.getJSONArray(it) } - .firstOrNull { it.optString(0) == "user-collections.hidden" }?.optJSONObject(1) - if (entry == null || entry.optBoolean("is_deleted")) emptySet() else { - val collection = org.json.JSONObject(entry.optString("value")) - fun ids(key: String) = collection.optJSONArray(key)?.let { a -> (0 until a.length()).map { a.optLong(it) } }.orEmpty() - ids("added").toSet() - ids("removed").toSet() - } - }.getOrDefault(emptySet()) + val hidden = SteamHidden.read(root) val private = runCatching { PRIVATE_APPS.find(File(config, "localconfig.vdf").readText())?.groupValues?.get(1) ?.split(',')?.mapNotNull { it.trim().toLongOrNull() }?.toSet() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt b/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt new file mode 100644 index 0000000000..71ab7de95c --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/frontend/SteamHidden.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.frontend + +import org.json.JSONArray +import org.json.JSONObject +import java.io.File + +internal object SteamHidden { + private const val KEY = "user-collections.hidden" + + private fun file(root: File): File? = AddedGames.accountConfig(root)?.let { File(it, "cloudstorage/cloud-storage-namespace-1.json") } + + class Saved(val hidden: Set, val queued: Boolean) + + private fun id(member: Any?): Long? = when (member) { + is Int -> member.toLong() + is Long -> member + is String -> member.toLongOrNull() + else -> null + } + + private fun ids(collection: JSONObject, key: String, strict: Boolean): List { + if (!collection.has(key)) return emptyList() + val array = collection.optJSONArray(key) ?: throw IllegalStateException(key) + return (0 until array.length()).mapNotNull { index -> + id(array.get(index)) ?: if (strict) throw IllegalStateException(key) else null + } + } + + fun read(root: File): Set = readOrNull(root).orEmpty() + + fun readOrNull(root: File): Set? = runCatching { + val entries = JSONArray(file(root)?.readText() ?: return null) + val slot = (0 until entries.length()).map { entries.getJSONArray(it) }.firstOrNull { it.optString(0) == KEY } + val entry = slot?.optJSONObject(1) + if (slot != null && entry == null) return null + if (entry == null || entry.optBoolean("is_deleted")) emptySet() else { + val collection = JSONObject(entry.optString("value")) + ids(collection, "added", false).toSet() - ids(collection, "removed", false).toSet() + } + }.getOrNull() + + fun write(root: File, appId: Long, hidden: Boolean, now: Long = System.currentTimeMillis() / 1000): Saved? = runCatching { + val target = file(root) ?: return null + val entries = JSONArray(target.readText()) + val slot = (0 until entries.length()).firstOrNull { entries.getJSONArray(it).optString(0) == KEY } + val entry = if (slot == null) JSONObject().put("key", KEY) else entries.getJSONArray(slot).optJSONObject(1) ?: return null + val live = !entry.optBoolean("is_deleted") + val collection = if (live && entry.has("value")) JSONObject(entry.optString("value")) else JSONObject().put("id", "hidden") + val added = ids(collection, "added", true).filter { it != appId } + val removed = ids(collection, "removed", true).filter { it != appId } + collection.put("added", JSONArray(if (hidden) added + appId else added)) + collection.put("removed", JSONArray(if (hidden) removed else removed + appId)) + entry.put("value", collection.toString()) + entry.put("timestamp", now) + entry.put("is_deleted", false) + entry.opt("version")?.toString()?.toLongOrNull()?.let { entry.put("version", (it + 1).toString()) } + if (slot == null) entries.put(JSONArray().put(KEY).put(entry)) + val temp = File(target.parentFile, target.name + ".tmp") + temp.writeText(entries.toString()) + if (!temp.renameTo(target)) { + temp.delete() + return null + } + Saved(ids(collection, "added", true).toSet() - ids(collection, "removed", true).toSet(), markModified(File(target.parentFile, "cloud-storage-namespace-1.modified.json"))) + }.getOrNull() + + private fun markModified(file: File): Boolean { + val pending = if (file.exists()) runCatching { JSONArray(file.readText()) }.getOrNull() ?: return false else JSONArray() + if ((0 until pending.length()).any { pending.optString(it) == KEY }) return true + val temp = File(file.parentFile, file.name + ".tmp") + val saved = runCatching { + temp.writeText(pending.put(KEY).toString()) + temp.renameTo(file) + }.getOrDefault(false) + if (!saved) temp.delete() + return saved + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 1464ac37be..7a234c561c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -255,6 +255,18 @@ object SessionPrefs { prefs(context).edit().putBoolean("libraryShowSize", show).apply() } + fun libraryShowHidden(context: Context): Boolean = prefs(context).getBoolean("libraryShowHidden", false) + + fun setLibraryShowHidden(context: Context, show: Boolean) { + prefs(context).edit().putBoolean("libraryShowHidden", show).apply() + } + + fun libraryHidden(context: Context): Set = prefs(context).getStringSet("libraryHidden", null)?.toSet().orEmpty() + + fun setLibraryHidden(context: Context, keys: Set) { + prefs(context).edit().putStringSet("libraryHidden", keys.toSet()).apply() + } + fun railLabels(context: Context): Boolean = prefs(context).getBoolean("railLabels", false) fun setRailLabels(context: Context, show: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt index f6c6227ea5..e50176e09c 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -1,5 +1,6 @@ package com.droiddeck.launcher.ui +import android.widget.Toast import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.LocalIndication import androidx.compose.ui.semantics.Role @@ -466,7 +467,10 @@ internal fun GameActions( } SecondaryButton(stringResource(R.string.bnet_open)) { a.onBattleNet() } } - if (game != null && !compactMenu) EditArtButton(game) + if (game != null && !compactMenu) { + HideButton(hideKey(game), game) + EditArtButton(game) + } } download != null -> { ActionChip(downloadLabel(download), ok = false) @@ -526,6 +530,8 @@ internal fun GameActions( } item != null -> PrimaryButton(buyLabel(item), main = true, modifier = leadOn) { openStoreUrl(ctx, item) } } + val entryKey = game?.let(::hideKey) ?: storeKey + if (!s.shortcutPicker && entryKey != null && (game == null || cloud)) HideButton(entryKey, game) if (cloud && (download != null || failed != null)) { XboxStreamButton(game.storeId.orEmpty(), game.name) XboxLibraryButton(game.storeId.orEmpty(), item) @@ -618,6 +624,17 @@ internal fun rememberEditArt(g: Library.SteamGame): (() -> Unit)? { } } +internal fun hideKey(g: Library.SteamGame): String = g.storeId?.let { "${g.source}:$it" } ?: GameRef.key(g) + +@Composable +internal fun HideButton(key: String, g: Library.SteamGame?) { + val ctx = LocalContext.current + rememberHiddenSync() + val hidden = LibraryHidden.isHidden(key, g) + val failed = stringResource(R.string.game_hide_failed) + SecondaryButton(stringResource(if (hidden) R.string.game_unhide else R.string.common_hide), compact = true) { if (!LibraryHidden.set(ctx, key, g, !hidden)) Toast.makeText(ctx, failed, Toast.LENGTH_LONG).show() } +} + @Composable internal fun EditArtButton(g: Library.SteamGame) { val open = rememberEditArt(g) ?: return @@ -628,6 +645,10 @@ internal fun EditArtButton(g: Library.SteamGame) { private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { var open by remember(g.gameId) { mutableStateOf(false) } val edit = rememberEditArt(g) + val ctx = LocalContext.current + rememberHiddenSync() + val hidden = LibraryHidden.isHidden(hideKey(g), g) + val failed = stringResource(R.string.game_hide_failed) Box { SecondaryButton(stringResource(R.string.game_more)) { open = !open } AnchoredMenu(open, onDismiss = { open = false }, title = stringResource(R.string.game_more), compact = true) { first -> @@ -638,6 +659,8 @@ private fun GameMoreMenu(g: Library.SteamGame, a: FrontEndActions) { MenuItem(stringResource(R.string.game_shortcut_add), checked = false, focusRequester = take()) { open = false; a.onGameShortcut(g) } MenuItem(stringResource(R.string.game_file_export), checked = false) { open = false; a.onExportGameFile(g) } MenuItem(stringResource(R.string.game_link_copy), checked = false) { open = false; a.onCopyGameLink(g) } + val hideKey = hideKey(g) + MenuItem(stringResource(if (hidden) R.string.game_unhide else R.string.common_hide), checked = false) { open = false; if (!LibraryHidden.set(ctx, hideKey, g, !hidden)) Toast.makeText(ctx, failed, Toast.LENGTH_LONG).show() } edit?.let { run -> MenuItem(stringResource(R.string.game_edit_art), checked = false) { open = false; run() } } } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt index 2aab3b4b9f..2756bc2812 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryFavorites.kt @@ -28,8 +28,12 @@ internal object LibraryFavorites { internal fun toggled(keys: Set, key: String): Set = if (key in keys) keys - key else keys + key -internal fun inLibrarySource(source: String, entry: LibraryEntry, favorites: Set): Boolean = when (source) { - LIBRARY_ALL -> true - LIBRARY_FAVORITES -> entry.favoriteKey in favorites - else -> entry.source == source +internal fun inLibrarySource(source: String, entry: LibraryEntry, favorites: Set, hidden: (LibraryEntry) -> Boolean = { false }): Boolean { + val concealed = hidden(entry) + return when (source) { + LIBRARY_HIDDEN -> concealed + LIBRARY_ALL -> !concealed + LIBRARY_FAVORITES -> !concealed && entry.favoriteKey in favorites + else -> !concealed && entry.source == source + } } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt new file mode 100644 index 0000000000..a0fb74ef6f --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryHidden.kt @@ -0,0 +1,78 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleEventObserver +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import com.droiddeck.launcher.frontend.AddedGames +import com.droiddeck.launcher.frontend.Library +import com.droiddeck.launcher.frontend.SteamHidden +import com.droiddeck.launcher.session.SessionPrefs + +internal const val LIBRARY_HIDDEN = "hidden" + +internal object LibraryHidden { + var keys by mutableStateOf>(emptySet()) + private set + var account by mutableStateOf(null) + private set + var steam by mutableStateOf>(emptySet()) + private set + + fun load(context: Context) { + keys = SessionPrefs.libraryHidden(context) + refreshSteam(context) + } + + fun refreshSteam(context: Context) { + val root = SessionPrefs.activeSteamRoot(context) + adopt(root) + SteamHidden.readOrNull(root)?.let { steam = it } + } + + private fun adopt(root: java.io.File) { + val resolved = AddedGames.accountConfig(root) + if (resolved != account) { + account = resolved + steam = emptySet() + } + } + + fun steamId(game: Library.SteamGame?): Long? = game?.takeIf { Library.fromSteamClient(it) }?.appId?.toLong() + + fun isHidden(key: String, game: Library.SteamGame?): Boolean = key in keys || steamId(game)?.let { it in steam } == true + + fun isHidden(entry: LibraryEntry): Boolean = isHidden(entry.favoriteKey, entry.game) + + fun set(context: Context, key: String, game: Library.SteamGame?, hidden: Boolean): Boolean { + val id = steamId(game) + val root = SessionPrefs.activeSteamRoot(context) + val written = id?.let { SteamHidden.write(root, it, hidden) } + if (id != null) { + adopt(root) + steam = written?.hidden ?: SteamHidden.readOrNull(root) ?: steam + } + keys = if (hidden && (id == null || written == null)) keys + key else keys - key + SessionPrefs.setLibraryHidden(context, keys) + return id == null || written?.queued == true + } +} + +@Composable +internal fun rememberHiddenSync() { + val ctx = LocalContext.current + remember { LibraryHidden.load(ctx) } + val lifecycle = LocalLifecycleOwner.current.lifecycle + DisposableEffect(lifecycle) { + val observer = LifecycleEventObserver { _, event -> if (event == Lifecycle.Event.ON_RESUME) LibraryHidden.refreshSteam(ctx) } + lifecycle.addObserver(observer) + onDispose { lifecycle.removeObserver(observer) } + } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt index 64e949b2cd..3a96df2f4b 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/LibraryPage.kt @@ -163,11 +163,17 @@ internal fun collectionEntries(all: List, items: List internal fun installedFirst(entries: List): List = entries.partition { it.installed }.let { (on, off) -> on + off } internal const val LIBRARY_ALL = "all" -internal fun librarySources(entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet()): List = - (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION) +internal fun librarySources( + entries: List, order: List, always: Set = emptySet(), favorites: Set = emptySet(), + hidden: (LibraryEntry) -> Boolean = { false }, showHidden: Boolean = false, +): List = + (listOf(LIBRARY_FAVORITES, Library.SOURCE_STEAM) + arrangeStoreTabs(order, emptySet()).map { it.store.id } + Library.ADDED + Library.SOURCE_COLLECTION + LIBRARY_HIDDEN) .filter { source -> - if (source == LIBRARY_FAVORITES) entries.any { it.favoriteKey in favorites } - else source in always || entries.any { it.source == source } + when (source) { + LIBRARY_HIDDEN -> showHidden + LIBRARY_FAVORITES -> entries.any { it.favoriteKey in favorites && !hidden(it) } + else -> source in always || entries.any { it.source == source && !hidden(it) } + } } internal object LibraryDisplay { @@ -178,11 +184,14 @@ internal object LibraryDisplay { private set var size by mutableStateOf(true) private set + var hidden by mutableStateOf(false) + private set fun load(context: android.content.Context) { level = SessionPrefs.libraryCardLevel(context).coerceIn(0, scales.lastIndex) title = SessionPrefs.libraryShowTitle(context) size = SessionPrefs.libraryShowSize(context) + hidden = SessionPrefs.libraryShowHidden(context) } fun step(context: android.content.Context, by: Int) { @@ -199,6 +208,11 @@ internal object LibraryDisplay { size = !size SessionPrefs.setLibraryShowSize(context, size) } + + fun toggleHidden(context: android.content.Context) { + hidden = !hidden + SessionPrefs.setLibraryShowHidden(context, hidden) + } } internal object LibraryView { @@ -228,8 +242,10 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, remember { LibraryDisplay.load(ctx) } remember { FolderSizes.load(ctx) } remember { LibraryFavorites.load(ctx) } + rememberHiddenSync() val soundMode = selected == "soundtracks" || selected.startsWith("sound:") val favorites = if (soundMode) emptySet() else LibraryFavorites.keys + val concealed: (LibraryEntry) -> Boolean = { !soundMode && LibraryHidden.isHidden(it) } val stores = !s.shortcutPicker && !soundMode val signedIn = Store.entries.filter { StoresState.isSignedIn(it) } LaunchedEffect(stores, signedIn) { if (stores) signedIn.forEach { StoresState.loadLibrary(ctx, it) } } @@ -267,7 +283,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val sources = librarySources( all, SessionPrefs.storesTabOrder(ctx), listOfNotNull(Store.ITCH.id.takeIf { itchSignedIn && !soundMode }, Store.GAMEJOLT.id.takeIf { gameJoltSignedIn && !soundMode }, Library.SOURCE_COLLECTION.takeIf { soundMode }).toSet(), - favorites, + favorites, concealed, LibraryDisplay.hidden && !soundMode, ) val source = LibraryView.source.takeIf { it == LIBRARY_ALL || it in sources } ?: LIBRARY_ALL val q = LibraryView.query.trim().lowercase() @@ -290,7 +306,7 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, val collectionItems = collectionId?.let { if (source == Store.GAMEJOLT.id) GameJoltCollections.gamesOf(it) else ItchCollections.gamesOf(it) } val pool = if (collectionId == null) all else collectionEntries(all, collectionItems.orEmpty(), Store.byId(source) ?: Store.ITCH) val matching = pool.filter { - inLibrarySource(source, it, favorites) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) + inLibrarySource(source, it, favorites, concealed) && (q.isEmpty() || it.title.lowercase().contains(q)) && keepsXbox(xboxFilter, it) } val listUninstalled = if (collectionId == null) showUninstalled else collectionShows?.takeIf { it.first == collectionId }?.second ?: true val trackHits by produceState>(emptyList(), soundMode, q, source, s.soundtracks) { @@ -317,8 +333,8 @@ internal fun LibraryPage(s: FrontEndState, a: FrontEndActions, selected: String, } } var savedDialog by remember { mutableStateOf(false) } - val candidates = if (listUninstalled) matching else matching.filter { it.installed } - val hiddenUninstalled = if (listUninstalled) 0 else matching.count { !it.installed } + val candidates = if (listUninstalled || source == LIBRARY_HIDDEN) matching else matching.filter { it.installed } + val hiddenUninstalled = if (listUninstalled || source == LIBRARY_HIDDEN) 0 else matching.count { !it.installed } val sort = s.storesSort val sizeSort = sort == "sizeAsc" || sort == "sizeDesc" val installedAt = StoresState.installed.associate { it.key to it.sidecar.installedAt } @@ -539,7 +555,7 @@ private fun LibraryGrid( } val picker = s.shortcutPicker && e.game != null val choose = if (picker) ({ a.onSteamGame(e.game!!) }) else null - if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES) + if (listMode) LibraryRow(e, first, navigation, choose, onOpen) else LibraryTile(e, capsules, first, navigation, choose, onOpen, showSource = source == LIBRARY_ALL || source == LIBRARY_FAVORITES || source == LIBRARY_HIDDEN) } LazyVerticalGrid( columns = if (listMode) GridCells.Fixed(1) else GridCells.Adaptive(tileWidth), state = grid, @@ -679,17 +695,19 @@ private fun LibraryHeader( @Composable private fun LibraryFilters(sources: List, source: String, onSource: (String) -> Unit, accounts: Boolean) { - if (sources.size < 2 && !accounts) return + val chips = sources.size >= 2 || sources.singleOrNull() == LIBRARY_HIDDEN + if (!chips && !accounts) return Row( horizontalArrangement = Arrangement.spacedBy(8.dp), verticalAlignment = Alignment.CenterVertically, modifier = Modifier.fillMaxWidth().padding(top = 4.dp, bottom = 2.dp).horizontalScroll(rememberScrollState()), ) { - if (sources.size >= 2) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } - if (sources.size >= 2) for (src in sources) { + if (chips) SourceFilterChip(LIBRARY_ALL, stringResource(R.string.stores_tab_all), source == LIBRARY_ALL, dot = null) { onSource(LIBRARY_ALL) } + if (chips) for (src in sources) { val store = Store.byId(src) val dot = when { store != null -> sourceColours(src).dot.copy(alpha = if (StoresState.isSignedIn(store) && StoresState.expired[store] != true) 1f else 0.35f) src == LIBRARY_FAVORITES -> FavoritesColours.dot + src == LIBRARY_HIDDEN -> Color(0xFF9AA0A6) src == Library.SOURCE_STEAM || src == Library.ADDED || src == Library.SOURCE_COLLECTION -> sourceColours(src).dot else -> null } @@ -698,6 +716,7 @@ private fun LibraryFilters(sources: List, source: String, onSource: (Str when (src) { Library.ADDED -> stringResource(R.string.library_filter_added) LIBRARY_FAVORITES -> stringResource(R.string.soundtracks_favorites) + LIBRARY_HIDDEN -> stringResource(R.string.apps_filter_hidden) else -> store?.shortLabel ?: sourceLabel(src) }, source == src, dot, @@ -1058,7 +1077,7 @@ internal fun DisplayButton() { HeaderIconButton(title, Icons.Filled.Visibility, "display") { val from = at ?: return@HeaderIconButton Steps.ask(StepAsk( - anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 4, + anchor = from, side = StepSide.Left, accent = pal.signal, pillCorner = 8.dp, items = 5, handle = { Icon(Icons.Filled.Visibility, null, tint = pal.signal, modifier = Modifier.size(18.dp)) }, ) { StepTitle(title) @@ -1081,6 +1100,10 @@ internal fun DisplayButton() { stringResource(R.string.library_display_size), selected = LibraryDisplay.size, enabled = open, modifier = Modifier.fillMaxWidth().stepItem(3), ) { LibraryDisplay.toggleSize(ctx) } + StepChoice( + stringResource(R.string.apps_filter_hidden), selected = LibraryDisplay.hidden, enabled = open, + modifier = Modifier.fillMaxWidth().stepItem(4), + ) { LibraryDisplay.toggleHidden(ctx) } } }) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt index 244ef0096f..7f2d0cb0c1 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamHome.kt @@ -83,12 +83,21 @@ private const val DRIFT_STEP_NS = 15_000_000L internal fun SteamHome(s: FrontEndState, a: FrontEndActions, modifier: Modifier) { val ctx = androidx.compose.ui.platform.LocalContext.current LaunchedEffect(Unit) { com.droiddeck.launcher.frontend.SteamFeatured.load(ctx) } - val featured = com.droiddeck.launcher.frontend.SteamFeatured.games + rememberHiddenSync() + val featuredAll = com.droiddeck.launcher.frontend.SteamFeatured.games val signedIn = s.offlineAccount != null - val owned by produceState(emptyList>(), signedIn) { - value = if (!signedIn) emptyList() else withContext(Dispatchers.IO) { runCatching { Library.steamLibraryArt(ctx).shuffled() }.getOrDefault(emptyList()) } + val account = LibraryHidden.account + val scanned by produceState>>>(account to emptyList(), signedIn, LibraryHidden.steam, account) { + val art = if (!signedIn) emptyList() else withContext(Dispatchers.IO) { runCatching { Library.steamLibraryArt(ctx).shuffled() }.getOrDefault(emptyList()) } + value = account to art } - val games = remember(s.steamGames) { s.steamGames.sortedWith(compareByDescending { it.lastPlayed }.thenBy { it.gameId }) } + val ownedAll = if (scanned.first == account) scanned.second else emptyList() + val concealed = remember(s.steamGames, LibraryHidden.keys, LibraryHidden.steam) { + LibraryHidden.steam + s.steamGames.filter { LibraryHidden.isHidden(hideKey(it), it) }.map { it.appId.toLong() } + } + val owned = remember(ownedAll, concealed) { ownedAll.filter { it.first.toLong() !in concealed } } + val featured = remember(featuredAll, concealed) { featuredAll.filter { it.appId.toLong() !in concealed } } + val games = remember(s.steamGames, LibraryHidden.keys, LibraryHidden.steam) { s.steamGames.filterNot { LibraryHidden.isHidden(hideKey(it), it) }.sortedWith(compareByDescending { it.lastPlayed }.thenBy { it.gameId }) } val narrow = LocalNarrowPane.current var words by remember { mutableStateOf(null) } val mode = com.droiddeck.launcher.session.SessionService.MODE_STEAM diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5f85d0392c..945453d05e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1605,6 +1605,8 @@ تعذّر على Android فتح نافذة ضمن النافذة. المزيد تعديل الصور + إزالة من المخفية + تعذّرت المزامنة مع Steam. أغلق Steam وحاول مرة أخرى. في Steam اختصار إضافة إلى الشاشة الرئيسية diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 6c67130a34..a0fc0812bd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -1651,6 +1651,8 @@ Android no pudo abrir imagen en imagen. Más Editar imágenes + Quitar de ocultas + No se pudo sincronizar con Steam. Cierra Steam e inténtalo de nuevo. En Steam Acceso directo Agregar a la pantalla de inicio diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index bddb2786e3..821fc8788a 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1573,6 +1573,8 @@ Android не можа да отвори картина в картината. Още Редактиране на изображенията + Премахване от скритите + Синхронизирането със Steam не успя. Затворете Steam и опитайте отново. В Steam Пряк път Добавяне към началния екран diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 008b70f6b7..285e30109d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1589,6 +1589,8 @@ Android nemohl otevřít obraz v obraze. Další Upravit grafiku + Odebrat ze skrytých + Synchronizace se Steamem se nezdařila. Zavřete Steam a zkuste to znovu. Ve Steamu Zkratka Přidat na domovskou obrazovku diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 13fed381f1..55cc16e75b 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1573,6 +1573,8 @@ Android kunne ikke åbne billede i billede. Mere Rediger grafik + Fjern fra skjulte + Kunne ikke synkronisere med Steam. Luk Steam og prøv igen. I Steam Genvej Tilføj til hjemmeskærm diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 40f17501cb..82e4fe4a75 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1565,6 +1565,8 @@ Android konnte Bild im Bild nicht öffnen. Mehr Grafiken bearbeiten + Nicht mehr ausblenden + Synchronisierung mit Steam fehlgeschlagen. Schließe Steam und versuche es erneut. In Steam Verknüpfung Zum Startbildschirm hinzufügen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ed3372012b..824ee992f2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1573,6 +1573,8 @@ Το Android δεν μπόρεσε να ανοίξει τη λειτουργία εικόνας εντός εικόνας. Περισσότερα Επεξεργασία εικαστικών + Κατάργηση από τις κρυφές + Αποτυχία συγχρονισμού με το Steam. Κλείστε το Steam και δοκιμάστε ξανά. Στο Steam Συντόμευση Προσθήκη στην αρχική οθόνη diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ebd821ecc3..587809e30e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1581,6 +1581,8 @@ Android no pudo abrir imagen en imagen. Más Editar imágenes + Quitar de ocultas + No se pudo sincronizar con Steam. Cierra Steam e inténtalo de nuevo. En Steam Acceso directo Añadir a la pantalla de inicio diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8bcb6fcce1..ed435167da 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1573,6 +1573,8 @@ Android ei pystynyt avaamaan kuva kuvassa -tilaa. Lisää Muokkaa kuvitusta + Poista piilotetuista + Synkronointi Steamin kanssa epäonnistui. Sulje Steam ja yritä uudelleen. Steamissa Pikakuvake Lisää aloitusnäytölle diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d61e1076d0..df6896bd4f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1580,6 +1580,8 @@ Android ne peut pas ouvrir le mode PiP. Plus Modifier les illustrations + Ne plus masquer + Synchronisation avec Steam impossible. Fermez Steam et réessayez. Dans Steam Raccourci Ajouter à l\'écran d\'accueil diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d9fac5e3c2..5e9a887d3d 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1573,6 +1573,8 @@ Android पिक्चर इन पिक्चर नहीं खोल सका। और आर्ट एडिट करें + छिपे हुए से हटाएं + Steam के साथ सिंक नहीं हो सका। Steam बंद करके फिर कोशिश करें। Steam में शॉर्टकट होम स्क्रीन पर जोड़ें diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9261430fec..a63d2e9c5b 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1573,6 +1573,8 @@ Az Android nem tudta megnyitni a kép a képben módot. Továbbiak Illusztrációk szerkesztése + Eltávolítás a rejtettek közül + Nem sikerült szinkronizálni a Steammel. Zárd be a Steamet, és próbáld újra. A Steamben Parancsikon Hozzáadás a kezdőképernyőhöz diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 00dcfe8d3a..fb83ce5228 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1566,6 +1566,8 @@ Android tidak dapat membuka gambar dalam gambar. Lainnya Edit gambar + Hapus dari tersembunyi + Gagal menyinkronkan dengan Steam. Tutup Steam lalu coba lagi. Di Steam Pintasan Tambahkan ke layar utama diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a3ca9a4562..88838f1748 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1572,6 +1572,8 @@ Android non è riuscito ad aprire il picture in picture. Altro Modifica grafica + Rimuovi dai nascosti + Impossibile sincronizzare con Steam. Chiudi Steam e riprova. In Steam Scorciatoia Aggiungi alla schermata Home diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 57cbc6756b..94d29d8716 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1566,6 +1566,8 @@ Androidがピクチャーインピクチャーを開けませんでした。 その他 アートを編集 + 非表示を解除 + Steamと同期できませんでした。Steamを終了してもう一度お試しください。 Steamに追加済み ショートカット ホーム画面に追加 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index be30c1a1df..4f8de4c21a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1566,6 +1566,8 @@ Android에서 PIP를 열 수 없습니다. 더보기 아트 편집 + 숨김 해제 + Steam과 동기화하지 못했습니다. Steam을 종료한 후 다시 시도하세요. Steam에 있음 바로 가기 홈 화면에 추가 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 28e6c4027c..3a79bb392d 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1566,6 +1566,8 @@ Android tidak dapat membuka gambar dalam gambar. Lagi Sunting seni + Alih keluar daripada tersembunyi + Tidak dapat menyegerak dengan Steam. Tutup Steam dan cuba lagi. Dalam Steam Pintasan Tambah ke skrin utama diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2195bf2092..b7aefa8a96 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1573,6 +1573,8 @@ Android kunne ikke åpne bilde-i-bilde. Mer Rediger grafikk + Fjern fra skjulte + Kunne ikke synkronisere med Steam. Lukk Steam og prøv igjen. I Steam Snarvei Legg til på hjem-skjermen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index fa50b066ba..76ff862bef 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1573,6 +1573,8 @@ Android kon scherm-in-scherm niet openen. Meer Afbeeldingen bewerken + Niet meer verbergen + Synchroniseren met Steam is mislukt. Sluit Steam en probeer het opnieuw. In Steam Snelkoppeling Toevoegen aan startscherm diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 08ca3aef85..c39caf2a40 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1589,6 +1589,8 @@ Android nie mógł otworzyć obrazu w obrazie. Więcej Edytuj grafiki + Usuń z ukrytych + Nie udało się zsynchronizować ze Steamem. Zamknij Steama i spróbuj ponownie. W Steam Skrót Dodaj do ekranu głównego diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ecbfd10091..3956a1e206 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1572,6 +1572,8 @@ O Android não conseguiu abrir o ecrã no ecrã. Mais Editar imagens + Remover dos ocultos + Não foi possível sincronizar com o Steam. Feche o Steam e tente novamente. No Steam Atalho Adicionar ao ecrã principal diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 940f40dfe6..405ad5bd06 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1580,6 +1580,8 @@ O Android não conseguiu abrir o picture-in-picture. Mais Editar artes + Remover dos ocultos + Não foi possível sincronizar com o Steam. Feche o Steam e tente novamente. Na Steam Atalho Adicionar à tela inicial diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 41052aa32f..29500e74e0 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1581,6 +1581,8 @@ Android nu a putut deschide imaginea în imagine. Mai multe Editează grafica + Elimină din ascunse + Nu s-a putut sincroniza cu Steam. Închide Steam și încearcă din nou. În Steam Comandă rapidă Adaugă pe ecranul principal diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f1cfd1a2de..1f3786b96a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1589,6 +1589,8 @@ Android не может открыть PiP. Ещё Изменить обложку + Убрать из скрытых + Не удалось синхронизировать со Steam. Закройте Steam и повторите попытку. В Steam Ярлык Добавить на главный экран diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2b5b56881a..ec494e1952 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -1573,6 +1573,8 @@ Android kunde inte öppna bild-i-bild. Mer Redigera grafik + Ta bort från dolda + Kunde inte synkronisera med Steam. Stäng Steam och försök igen. I Steam Genväg Lägg till på hemskärmen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 72ede34020..9172d0931c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1566,6 +1566,8 @@ Android ไม่สามารถเปิดภาพซ้อนภาพได้ เพิ่มเติม แก้ไขภาพปก + นำออกจากที่ซ่อนไว้ + ซิงค์กับ Steam ไม่สำเร็จ ปิด Steam แล้วลองอีกครั้ง ใน Steam ช็อตคัต เพิ่มไปยังหน้าจอหลัก diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b22e72c040..29153e59f3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1565,6 +1565,8 @@ Android, pencere içinde pencereyi açamadı. Diğer Görseli düzenle + Gizlilikten çıkar + Steam ile senkronize edilemedi. Steam\'i kapatıp tekrar deneyin. Steam\'de Kısayol Ana ekrana ekle diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5ed3e0dffe..3af14ceaf0 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1589,6 +1589,8 @@ Android не вдалося відкрити режим «Картинка в картинці». Більше Змінити обкладинку + Прибрати з прихованих + Не вдалося синхронізувати зі Steam. Закрийте Steam і спробуйте ще раз. У Steam Ярлик Додати на головний екран diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6179086eb8..ed29d93e42 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1566,6 +1566,8 @@ Android không thể mở hình trong hình. Thêm Sửa ảnh bìa + Bỏ ẩn + Không thể đồng bộ với Steam. Hãy đóng Steam rồi thử lại. Trong Steam Shortcut Thêm vào màn hình chính diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 06b91530e2..2daf99deba 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1649,6 +1649,8 @@ Android 无法打开画中画。 更多 编辑封面 + 取消隐藏 + 无法与 Steam 同步。请关闭 Steam 后重试。 已在 Steam 中 快捷方式 添加到主屏幕 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 7425fa7d7c..21abd5d128 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1565,6 +1565,8 @@ Android 無法開啟畫中畫。 更多 編輯圖片 + 取消隱藏 + 無法與 Steam 同步。請關閉 Steam 後再試。 在 Steam 中 捷徑 加至主畫面 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5346cf8bc6..5716d8859c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1565,6 +1565,8 @@ Android 無法開啟子母畫面。 更多 編輯圖片 + 取消隱藏 + 無法與 Steam 同步。請關閉 Steam 後再試。 在 Steam 中 捷徑 新增至主螢幕 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ed9fdd3820..dbad01b39c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1757,6 +1757,8 @@ Android could not open picture in picture. More Edit art + Remove hidden + Couldn\'t sync with Steam. Close Steam and try again. In Steam Shortcut Add to home screen diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt new file mode 100644 index 0000000000..bca99f5188 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/SteamHiddenTest.kt @@ -0,0 +1,101 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.json.JSONArray +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertNotNull +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33]) +class SteamHiddenTest { + @get:Rule val tmp = TemporaryFolder() + + private fun steamRoot(): File = tmp.newFolder("Steam").also { root -> + File(root, "config").mkdirs() + File(root, "config/loginusers.vdf").writeText( + "\"users\"\n{\n\t\"76561198352563669\"\n\t{\n\t\t\"AccountName\"\t\t\"a\"\n\t\t\"MostRecent\"\t\t\"1\"\n\t}\n}\n") + } + + private fun store(root: File, json: String?): File { + val dir = File(root, "userdata/392297941/config/cloudstorage").apply { mkdirs() } + return File(dir, "cloud-storage-namespace-1.json").also { f -> json?.let { f.writeText(it) } } + } + + private fun hiddenEntry(file: File): JSONObject { + val entries = JSONArray(file.readText()) + return (0 until entries.length()).map { entries.getJSONArray(it) }.first { it.getString(0) == "user-collections.hidden" }.getJSONObject(1) + } + + @Test fun hidingAddsTheGameAndKeepsOtherEntries() { + val root = steamRoot() + val file = store(root, """[["user-collections.favorite",{"key":"user-collections.favorite","value":"{}"}],["user-collections.hidden",{"key":"user-collections.hidden","timestamp":5,"version":"7","value":"{\"id\":\"hidden\",\"name\":\"Hidden\",\"added\":[10],\"removed\":[]}"}]]""") + assertNotNull(SteamHidden.write(root, 440, true, now = 99)) + assertEquals(setOf(10L, 440L), SteamHidden.read(root)) + val entry = hiddenEntry(file) + assertEquals(99L, entry.getLong("timestamp")) + assertEquals("8", entry.getString("version")) + assertEquals("Hidden", JSONObject(entry.getString("value")).getString("name")) + assertEquals(2, JSONArray(file.readText()).length()) + } + + @Test fun unhidingTakesTheGameOutAgain() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[10,440],\"removed\":[]}"}]]""") + assertNotNull(SteamHidden.write(root, 440, false)) + assertEquals(setOf(10L), SteamHidden.read(root)) + } + + @Test fun aMissingCollectionIsCreatedWhenHiding() { + val root = steamRoot() + val file = store(root, "[]") + assertNotNull(SteamHidden.write(root, 2931908220L, true)) + assertEquals(setOf(2931908220L), SteamHidden.read(root)) + assertFalse(hiddenEntry(file).getBoolean("is_deleted")) + } + + @Test fun aDeletedCollectionIsRevivedWhenHiding() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","is_deleted":true}]]""") + assertEquals(emptySet(), SteamHidden.read(root)) + assertNotNull(SteamHidden.write(root, 7, true)) + assertEquals(setOf(7L), SteamHidden.read(root)) + } + + @Test fun withoutASteamStoreNothingIsWritten() { + val root = steamRoot() + assertNull(SteamHidden.write(root, 1, true)) + assertEquals(emptySet(), SteamHidden.read(root)) + } + + @Test fun theCollectionIsMarkedAsPendingUploadOnce() { + val root = steamRoot() + val file = store(root, "[]") + SteamHidden.write(root, 1, true) + SteamHidden.write(root, 2, true) + assertEquals("""["user-collections.hidden"]""", File(file.parentFile, "cloud-storage-namespace-1.modified.json").readText()) + } + + @Test fun aMalformedMemberIsRejectedAndTheFileIsLeftAlone() { + val root = steamRoot() + val json = """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[\"x\"],\"removed\":[]}"}]]""" + val file = store(root, json) + assertEquals(emptySet(), SteamHidden.readOrNull(root)) + assertNull(SteamHidden.write(root, 1, true)) + assertEquals(json, file.readText()) + } + + @Test fun numericStringsAreReadAndBadMembersAreSkipped() { + val root = steamRoot() + store(root, """[["user-collections.hidden",{"key":"user-collections.hidden","value":"{\"id\":\"hidden\",\"added\":[\"440\",\"x\",4.5,730],\"removed\":[]}"}]]""") + assertEquals(setOf(440L, 730L), SteamHidden.read(root)) + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt new file mode 100644 index 0000000000..ac5835c2a5 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/LibraryHiddenTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import com.droiddeck.launcher.frontend.Library +import org.junit.Assert.assertEquals +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class LibraryHiddenTest { + private fun steam(id: Int, name: String) = LibraryEntry("app:$id", Library.SOURCE_STEAM, name, Library.SteamGame(id, name, null, "Steam library"), null, true) + + private val tf2 = steam(440, "Team Fortress 2") + private val cs = steam(10, "Counter-Strike") + private val hiddenSet = setOf(tf2.favoriteKey) + private val hidden: (LibraryEntry) -> Boolean = { it.favoriteKey in hiddenSet } + + @Test fun hiddenGamesLeaveAllAndTheirStoreTab() { + assertFalse(inLibrarySource(LIBRARY_ALL, tf2, emptySet(), hidden)) + assertFalse(inLibrarySource(Library.SOURCE_STEAM, tf2, emptySet(), hidden)) + assertTrue(inLibrarySource(LIBRARY_ALL, cs, emptySet(), hidden)) + assertTrue(inLibrarySource(Library.SOURCE_STEAM, cs, emptySet(), hidden)) + } + + @Test fun hiddenGamesLeaveFavorites() { + assertFalse(inLibrarySource(LIBRARY_FAVORITES, tf2, setOf(tf2.favoriteKey), hidden)) + } + + @Test fun theHiddenSourceHoldsOnlyHiddenGames() { + assertTrue(inLibrarySource(LIBRARY_HIDDEN, tf2, emptySet(), hidden)) + assertFalse(inLibrarySource(LIBRARY_HIDDEN, cs, emptySet(), hidden)) + } + + @Test fun theHiddenTabIsLastAndOnlyWhenEnabled() { + val entries = listOf(tf2, cs) + assertEquals(listOf(Library.SOURCE_STEAM), librarySources(entries, emptyList(), hidden = hidden)) + assertEquals(listOf(Library.SOURCE_STEAM, LIBRARY_HIDDEN), librarySources(entries, emptyList(), hidden = hidden, showHidden = true)) + } + + @Test fun aStoreTabWithOnlyHiddenGamesDisappears() { + assertEquals(emptyList(), librarySources(listOf(tf2), emptyList(), hidden = hidden)) + } +}