diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index c5cd88f0b9..99bdf9edcc 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -610,6 +610,7 @@ class MainActivity : ComponentActivity() { val known = steamGames.mapNotNull { it.gameFiles?.path }.toSet() updateAddedGames(folders, then = { if (folders.any { it !in known }) fetchAddedGameArt() }) }, + onSteamGameArtChanged = { appId -> refreshSteamGameArt(appId) }, onAddedGameRemoved = { folder, appId, name -> removeAddedGame(folder, appId, name) }, onAddedGamesArt = { on -> SessionPrefs.setAddedGamesArt(this, on); addedGamesArt = on; if (on) refreshAddedGames() }, onSgdbKey = { key -> @@ -1440,6 +1441,13 @@ class MainActivity : ComponentActivity() { }, "added-games-update").start() } + private fun refreshSteamGameArt(appId: Int) { + Thread({ + val fresh = com.droiddeck.launcher.frontend.Library.steamGames(this).firstOrNull { it.appId == appId } ?: return@Thread + ui.post { steamGames = steamGames.map { if (it.appId == appId && it.library != Library.ADDED) fresh else it } } + }, "steam-art-update").start() + } + private fun removeAddedGame(folder: String, appId: Long?, name: String) { steamGames = steamGames.filterNot { it.library == Library.ADDED && it.gameFiles?.path == folder } Thread({ com.droiddeck.launcher.frontend.AddedGames.remove(this, java.io.File(folder), appId, name) }, "added-game-remove").start() diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt index efff05c8a7..846c7b5af7 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/AddedGameArt.kt @@ -42,7 +42,7 @@ object AddedGameArt { private val CHOSEN = Regex("""chosen-(\w+)\.(\w+)""") - private fun chosen(cache: File, slot: Slot): File? = + internal fun chosen(cache: File, slot: Slot): File? = cache.listFiles { f -> CHOSEN.matchEntire(f.name)?.groupValues?.get(1) == slot.key }?.firstOrNull() private val IMAGE = listOf("png", "jpg", "jpeg") @@ -117,36 +117,37 @@ object AddedGameArt { folderImages(game.folder).forEach { out.add(Option(FOLDER, it.path, it.path)) } val cache = cacheDir(context, game) val steamId = SteamMatch.resolve(context, game.folder.path, game.exe, game.name, legacy = File(cache, "steam-appid")).appId?.toString() - val remote = when (slot) { Slot.COVER -> "library_600x900.jpg"; Slot.BACKGROUND -> "library_hero.jpg"; Slot.LOGO -> "logo.png"; Slot.ICON -> null } - if (steamId != null && remote != null) { - val url = "$CDN$steamId/$remote".takeIf { exists(it) } ?: steamAssetUrl(steamId, remote) - if (url != null) out.add(Option(STEAM, url, url)) - } - var status = SteamGridDb.Status.OK - val key = SteamGridDb.key(context) - if (key.isEmpty()) { - status = SteamGridDb.Status.NO_KEY - } else { - cache.mkdirs() - try { - val gridId = remembered(File(cache, "sgdb-id"), SteamGridDb.keyChangedAt(context), retryMiss = true) { - SteamGridDb.gameId(key, steamId?.toIntOrNull(), game.name)?.toString() - }?.toIntOrNull() - if (gridId == null) status = SteamGridDb.Status.NO_GAME - else SteamGridDb.images(key, gridId, slot, if (slot == Slot.ICON) 3 else 5) - .forEach { (thumb, full) -> out.add(Option(SGDB, thumb, full)) } - } catch (e: Exception) { - Log.w(TAG, "${game.name}: SteamGridDB failed (${e.javaClass.simpleName})") - status = (e as? SteamGridDb.Failed)?.status ?: SteamGridDb.Status.SERVER - } - } + if (steamId != null) steamOption(steamId, slot)?.let { out.add(it) } + val (found, status) = sgdbChoices(context, File(cache, "sgdb-id"), steamId?.toIntOrNull(), game.name, slot) + out.addAll(found) return Choices(out, status) } + internal fun steamOption(steamId: String, slot: Slot): Option? { + val remote = when (slot) { Slot.COVER -> "library_600x900.jpg"; Slot.BACKGROUND -> "library_hero.jpg"; Slot.LOGO -> "logo.png"; Slot.ICON -> null } ?: return null + val url = "$CDN$steamId/$remote".takeIf { exists(it) } ?: steamAssetUrl(steamId, remote) ?: return null + return Option(STEAM, url, url) + } + + internal fun sgdbChoices(context: Context, marker: File, steamId: Int?, name: String, slot: Slot): Pair, SteamGridDb.Status> { + val key = SteamGridDb.key(context) + if (key.isEmpty()) return emptyList