From 875f8e3ce2bf2e762cba63057740200232936e6d Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 13:09:21 -0500 Subject: [PATCH] feat(wow): download addons from WoWInterface and open CurseForge in the browser (#2219) --- README.md | 1 + .../com/droiddeck/launcher/core/Hashes.kt | 3 + .../launcher/runtime/WowAddonCatalog.kt | 245 ++++++++++++++++++ .../com/droiddeck/launcher/ui/AddonBrowser.kt | 226 ++++++++++++++++ .../com/droiddeck/launcher/ui/GameDetail.kt | 3 + app/src/main/res/values-ar/strings.xml | 7 + app/src/main/res/values-b+es+419/strings.xml | 7 + app/src/main/res/values-bg/strings.xml | 7 + app/src/main/res/values-cs/strings.xml | 7 + app/src/main/res/values-da/strings.xml | 7 + app/src/main/res/values-de/strings.xml | 7 + app/src/main/res/values-el/strings.xml | 7 + app/src/main/res/values-es/strings.xml | 7 + app/src/main/res/values-fi/strings.xml | 7 + app/src/main/res/values-fr/strings.xml | 7 + app/src/main/res/values-hi/strings.xml | 7 + app/src/main/res/values-hu/strings.xml | 7 + app/src/main/res/values-in/strings.xml | 7 + app/src/main/res/values-it/strings.xml | 7 + app/src/main/res/values-ja/strings.xml | 7 + app/src/main/res/values-ko/strings.xml | 7 + app/src/main/res/values-ms/strings.xml | 7 + app/src/main/res/values-nb/strings.xml | 7 + app/src/main/res/values-nl/strings.xml | 7 + app/src/main/res/values-pl/strings.xml | 7 + app/src/main/res/values-pt-rPT/strings.xml | 7 + app/src/main/res/values-pt/strings.xml | 7 + app/src/main/res/values-ro/strings.xml | 7 + app/src/main/res/values-ru/strings.xml | 7 + app/src/main/res/values-sv/strings.xml | 7 + app/src/main/res/values-th/strings.xml | 7 + app/src/main/res/values-tr/strings.xml | 7 + app/src/main/res/values-uk/strings.xml | 7 + app/src/main/res/values-vi/strings.xml | 7 + app/src/main/res/values-zh-rCN/strings.xml | 7 + app/src/main/res/values-zh-rHK/strings.xml | 7 + app/src/main/res/values-zh-rTW/strings.xml | 7 + app/src/main/res/values/strings.xml | 9 + .../launcher/runtime/WowAddonCatalogTest.kt | 199 ++++++++++++++ 39 files changed, 910 insertions(+) create mode 100644 app/src/main/java/com/droiddeck/launcher/runtime/WowAddonCatalog.kt create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/AddonBrowser.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/runtime/WowAddonCatalogTest.kt diff --git a/README.md b/README.md index e9f172bfa1..606b7a6707 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ DroidDeck is [GPL-3.0](LICENSE). Steam and Proton belong to Valve Corporation. V - Battle.net is by [@kayakyakr](https://github.com/kayakyakr). It runs Blizzard's own client in Proton (downloaded from Blizzard, not included) and shows key art from the [Battle.net Shop](https://shop.battle.net). Without Steam, its games see the pad as an Xbox 360 controller via `PROTON_SPOOF_STEAMINPUT_VIDPID` in [Proton](https://github.com/ValveSoftware/wine)'s `dlls/winebus.sys`. - Battle.net installs drive Blizzard's Agent the way [@barncastle](https://github.com/barncastle)'s [Battle.Net-Installer](https://github.com/barncastle/Battle.Net-Installer) does, with requests from [wowdev.wiki](https://wowdev.wiki/Agent). Read without taking code: [@mubaraknumann](https://github.com/mubaraknumann)'s [unifideck](https://github.com/mubaraknumann/unifideck), [@djmittens](https://github.com/djmittens)'s [neo-mittens](https://github.com/djmittens/neo-mittens) `bnetswitch`, [@BCD1210](https://github.com/BCD1210)'s [soju](https://github.com/BCD1210/soju) and [Lutris](https://github.com/lutris/lutris)'s `product.db` reader. - World of Warcraft addon imports replace an addon's folder from a temporary copy, as [WowUp](https://github.com/WowUp/WowUp) does, and read flavour folders the way [WoWDeck](https://github.com/sigboe/wowdeck) does. No code from either is used. +- The World of Warcraft addon Download window searches [WoWInterface](https://www.wowinterface.com) through its MMOUI API. [CurseForge](https://www.curseforge.com/wow) opens in the user's browser, with no API and no key. - Xbox games load [@domsvoboda](https://github.com/domsvoboda)'s [xodus-nexus](https://github.com/domsvoboda/xodus-nexus) modules (LGPL-2.1-or-later), including `wintypes.dll`. Minecraft's GameInput setup was checked against [@Wyze3306](https://github.com/Wyze3306)'s [BedrockOnLinux](https://github.com/Wyze3306/BedrockOnLinux) (MIT). - The Xbox Cloud Gaming player uses the WebRTC client of [@unknownskl](https://github.com/unknownskl)'s [Greenlight](https://github.com/unknownskl/greenlight) (MIT), and its offer tweaks and sharpening follow [@redphx](https://github.com/redphx)'s [Better xCloud](https://github.com/redphx/better-xcloud) (MIT). See `tools/xcloud-player/NOTICE.md`. - The itch.io butler pack ships butler's `7z.so`, itch.io's build of [7-Zip](https://www.7-zip.org) by Igor Pavlov (LGPL-2.1, unRAR restriction on RAR code), unmodified. Other archives use Apache Commons Compress and the runtime's bsdtar (libarchive). diff --git a/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt b/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt index 0e4dce5001..9f133dcf40 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/Hashes.kt @@ -12,6 +12,9 @@ object Hashes { @JvmStatic fun sha512(file: File): String = hex(file, "SHA-512") + @JvmStatic + fun md5(file: File): String = hex(file, "MD5") + @JvmStatic fun isGithubSha256(digest: String?): Boolean = digest != null && digest.matches(GITHUB_SHA256) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/WowAddonCatalog.kt b/app/src/main/java/com/droiddeck/launcher/runtime/WowAddonCatalog.kt new file mode 100644 index 0000000000..63c1436f14 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/runtime/WowAddonCatalog.kt @@ -0,0 +1,245 @@ +package com.droiddeck.launcher.runtime + +import android.content.Context +import android.util.Log +import com.droiddeck.launcher.R +import com.droiddeck.launcher.core.Downloader +import com.droiddeck.launcher.core.Hashes +import com.droiddeck.launcher.stores.StoreNet +import org.json.JSONArray +import java.io.File +import java.io.IOException +import java.net.URLEncoder + +object WowAddonCatalog { + private const val TAG = "WowAddonCatalog" + enum class Sort { POPULAR, UPDATED, NAME, DOWNLOADS } + + class Category(val id: String, val name: String) + + class Client(val folder: String, val family: String?) + + class Query(val text: String = "", val category: String? = null, val client: Client, val sort: Sort = Sort.POPULAR) + + class Addon( + val id: String, + val name: String, + val author: String, + val summary: String, + val downloads: Long, + val updated: Long, + val thumb: String?, + ) + + class Page(val items: List, val more: Boolean) + + internal class Entry(val addon: Addon, val category: String, val flavors: Set?, val monthly: Long = 0L) + + internal class Cat(val id: String, val name: String, val parents: List) + + private const val WOWI = "https://api.mmoui.com/v3/game/WOW/" + private const val CURSEFORGE = "https://www.curseforge.com/wow/search?class=addons" + private const val WOWI_FILES = "wowi-filelist.json" + internal const val FRESH_MS = 6L * 60 * 60 * 1000 + + internal const val RETAIL = "_retail_" + internal const val ERA = "_classic_era_" + internal const val CLASSIC = "_classic_" + internal const val ANNIVERSARY = "_anniversary_" + internal const val FOREVER = "_forever_" + + private val TEST_SUFFIX = Regex("_(beta|ptr|xptr)_$") + + internal fun flavorOf(version: String): String? { + val major = version.substringBefore('.').trim().toIntOrNull() ?: return null + return when { + major == 1 -> ERA + major == 2 -> ANNIVERSARY + major in 3..5 -> CLASSIC + major >= 10 -> RETAIL + else -> null + } + } + + internal fun baseFolder(folder: String): String = folder.replace(TEST_SUFFIX, "_") + + internal fun folderFamily(folder: String): String? = when (val base = baseFolder(folder)) { + FOREVER -> RETAIL + RETAIL, ERA, CLASSIC, ANNIVERSARY -> base + else -> null + } + + internal fun buildInfoVersion(buildInfo: String, product: String): String? { + val lines = buildInfo.lineSequence().map { it.trim() }.filter { it.isNotEmpty() }.toList() + if (lines.isEmpty()) return null + val header = lines.first().split('|').map { it.substringBefore('!').trim().lowercase() } + val productAt = header.indexOf("product") + val versionAt = header.indexOf("version") + if (productAt < 0 || versionAt < 0) return null + return lines.drop(1).map { it.split('|') } + .firstOrNull { it.getOrNull(productAt)?.trim().equals(product, ignoreCase = true) } + ?.getOrNull(versionAt)?.trim()?.ifEmpty { null } + } + + internal fun flavorProduct(flavorInfo: String): String? = + flavorInfo.lineSequence().map { it.trim() }.filter { it.isNotEmpty() && '!' !in it }.firstOrNull() + + internal fun clientVersion(flavorDir: File): String? { + val product = runCatching { File(flavorDir, ".flavor.info").readText() }.getOrNull()?.let(::flavorProduct) ?: return null + val info = runCatching { File(flavorDir.parentFile, ".build.info").readText() }.getOrNull() ?: return null + return buildInfoVersion(info, product) + } + + internal fun client(folder: String, version: String?): Client = + Client(folder, version?.let(::flavorOf) ?: folderFamily(folder)) + + fun client(target: WowAddons.Target): Client { + val dir = target.addOns.parentFile?.parentFile + return client(target.flavor, dir?.let(::clientVersion)) + } + + internal fun flavorMatches(flavors: Set?, family: String?): Boolean = + flavors == null || family == null || family in flavors + + internal fun parseWowiFiles(json: String): List { + val arr = JSONArray(json) + val out = ArrayList(arr.length()) + for (i in 0 until arr.length()) { + val o = arr.optJSONObject(i) ?: continue + val id = o.optString("UID") + if (id.isEmpty()) continue + val compat = o.optJSONArray("UICompatibility") + val flavors = if (compat == null || compat.length() == 0) null else { + val set = HashSet() + for (k in 0 until compat.length()) compat.optJSONObject(k)?.optString("version")?.let(::flavorOf)?.let(set::add) + set + } + val thumbs = o.optJSONArray("UIIMG_Thumbs") + val thumb = if (thumbs != null && thumbs.length() > 0) thumbs.optString(0).ifEmpty { null } else null + val addon = Addon( + id, o.optString("UIName"), o.optString("UIAuthorName"), o.optString("UIVersion"), + o.optString("UIDownloadTotal").toLongOrNull() ?: 0L, o.optLong("UIDate"), thumb, + ) + out.add(Entry(addon, o.optString("UICATID"), flavors, o.optString("UIDownloadMonthly").toLongOrNull() ?: 0L)) + } + return out + } + + internal fun parseWowiCategories(json: String): List { + val arr = JSONArray(json) + val out = ArrayList(arr.length()) + for (i in 0 until arr.length()) { + val o = arr.optJSONObject(i) ?: continue + val parents = o.optJSONArray("UICATParentIDs") + out.add(Cat(o.optString("UICATID"), o.optString("UICATTitle"), (0 until (parents?.length() ?: 0)).map { parents!!.optString(it) })) + } + return out + } + + internal fun filterWowi(entries: List, cats: List, query: Query): List { + val parents = cats.associate { it.id to it.parents } + val text = query.text.trim().lowercase() + val list = entries.filter { e -> + flavorMatches(e.flavors, query.client.family) && + (query.category == null || e.category == query.category || query.category in (parents[e.category] ?: emptyList())) && + (text.isEmpty() || e.addon.name.lowercase().contains(text) || e.addon.author.lowercase().contains(text)) + } + return when (query.sort) { + Sort.POPULAR -> list.sortedWith(compareByDescending { it.monthly }.thenByDescending { it.addon.downloads }) + Sort.DOWNLOADS -> list.sortedByDescending { it.addon.downloads } + Sort.UPDATED -> list.sortedByDescending { it.addon.updated } + Sort.NAME -> list.sortedBy { it.addon.name.lowercase() } + }.map { it.addon } + } + + internal fun pageOf(all: List, page: Int, pageSize: Int): Page { + val from = (page * pageSize).coerceAtMost(all.size) + val to = (from + pageSize).coerceAtMost(all.size) + return Page(all.subList(from, to), to < all.size) + } + + internal fun cached(file: File, now: Long, fetch: () -> String?): String? { + val kept = if (file.isFile) file.readText().takeIf(::isJsonArray) else null + if (kept != null && isFresh(file, now)) return kept + val body = fetch()?.takeIf(::isJsonArray) + if (body != null) { + val part = File(file.parentFile, "${file.name}.${java.util.UUID.randomUUID()}.part") + runCatching { + file.parentFile?.mkdirs() + part.writeText(body) + part.setLastModified(now) + if (!part.renameTo(file)) Log.w(TAG, "could not keep ${file.name}") + }.onFailure { Log.w(TAG, "could not keep ${file.name}", it) } + part.delete() + return body + } + return kept + } + + private fun isJsonArray(body: String): Boolean = + runCatching { org.json.JSONTokener(body).nextValue() }.getOrNull() is JSONArray + + private fun isFresh(file: File, now: Long) = file.isFile && now - file.lastModified() < FRESH_MS + + private fun cacheFile(context: Context, name: String) = File(File(context.cacheDir, "wowaddons"), name) + + private fun cachedGet(context: Context, name: String, url: String): String? = + cached(cacheFile(context, name), System.currentTimeMillis()) { StoreNet.get(url, timeoutMs = 60_000) } + + private fun unreachable(context: Context) = + IOException(context.getString(R.string.addons_unreachable, context.getString(R.string.addons_source_wowi))) + + fun search(context: Context, query: Query, page: Int, pageSize: Int = 40): Page = + pageOf(filterWowi(wowiEntries(context), wowiCategories(context), query), page, pageSize) + + private class Memo(val stamp: Long, val size: Long, val entries: List) + + @Volatile private var wowiMemo: Memo? = null + + private fun wowiEntries(context: Context): List { + val file = cacheFile(context, WOWI_FILES) + val memo = wowiMemo + if (memo != null && isFresh(file, System.currentTimeMillis()) && memo.stamp == file.lastModified() && memo.size == file.length()) return memo.entries + val body = cachedGet(context, WOWI_FILES, WOWI + "filelist.json") ?: throw unreachable(context) + return parseWowiFiles(body).also { wowiMemo = Memo(file.lastModified(), file.length(), it) } + } + + private fun wowiCategories(context: Context): List = + cachedGet(context, "wowi-categories.json", WOWI + "categorylist.json")?.let(::parseWowiCategories) ?: emptyList() + + fun categories(context: Context): List = wowiCategories(context).map { Category(it.id, it.name) } + + internal fun parseWowiDetails(json: String): Pair? { + val o = JSONArray(json).optJSONObject(0) ?: return null + val url = o.optString("UIDownload").ifEmpty { return null } + return url to o.optString("UIMD5").ifEmpty { null } + } + + internal fun isHttps(url: String) = url.startsWith("https://", ignoreCase = true) + + internal fun md5Matches(file: File, expected: String?): Boolean = + expected.isNullOrBlank() || Hashes.md5(file).equals(expected.trim(), ignoreCase = true) + + fun download(context: Context, addon: Addon, dest: File, progress: (Int) -> Unit): File { + val body = StoreNet.get(WOWI + "filedetails/${URLEncoder.encode(addon.id, "UTF-8")}.json", timeoutMs = 30_000) + ?: throw unreachable(context) + val (url, md5) = parseWowiDetails(body) ?: throw IOException(context.getString(R.string.addons_no_file)) + if (!isHttps(url)) throw IOException(context.getString(R.string.addons_no_file)) + dest.parentFile?.mkdirs() + dest.delete() + val ok = Downloader.downloadFile(url, dest, false) { f -> if (f >= 0) progress((f * 100).toInt().coerceIn(0, 100)) } + if (!ok || !dest.isFile) { + dest.delete() + throw unreachable(context) + } + if (!md5Matches(dest, md5)) { + dest.delete() + throw IOException(context.getString(R.string.selfinst_checksum_mismatch)) + } + progress(100) + return dest + } + + internal fun curseForgeUrl(text: String): String = + text.trim().let { if (it.isEmpty()) CURSEFORGE else CURSEFORGE + "&search=" + URLEncoder.encode(it, "UTF-8") } +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddonBrowser.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddonBrowser.kt new file mode 100644 index 0000000000..89e84fe697 --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddonBrowser.kt @@ -0,0 +1,226 @@ +package com.droiddeck.launcher.ui + +import android.content.Context +import android.content.Intent +import android.net.Uri +import android.widget.Toast +import androidx.compose.foundation.LocalIndication +import androidx.compose.foundation.clickable +import androidx.compose.foundation.hoverable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Check +import androidx.compose.material3.Icon +import androidx.compose.material3.LinearProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateListOf +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.produceState +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.semantics.Role +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R +import com.droiddeck.launcher.runtime.WowAddonCatalog +import com.droiddeck.launcher.runtime.WowAddons +import com.droiddeck.launcher.session.SessionState +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.File + +private class AddonResults { + val items = mutableStateListOf() + var page by mutableIntStateOf(0) + var loading by mutableStateOf(false) + var failed by mutableStateOf(null) + var more by mutableStateOf(false) +} + +@Composable +internal fun AddonBrowserDialog(targets: List, initial: WowAddons.Target, onDismiss: () -> Unit) { + val context = LocalContext.current.applicationContext + val scope = rememberCoroutineScope() + val shown = rememberShown(onDismiss) + val close = { shown.targetState = false } + var target by remember { mutableStateOf(initial) } + var text by remember { mutableStateOf("") } + var category by remember { mutableStateOf(null) } + var sort by remember { mutableStateOf(WowAddonCatalog.Sort.POPULAR) } + val results = remember(text, category, sort, target) { AddonResults() } + val installing = remember { mutableStateMapOf() } + val installed = remember { mutableStateMapOf() } + val categories by produceState(emptyList()) { + value = withContext(Dispatchers.IO) { runCatching { WowAddonCatalog.categories(context) }.getOrDefault(emptyList()) } + } + fun load(page: Int) { + if (results.loading) return + results.loading = true + results.failed = null + val into = target + val words = text + val cat = category?.id + val order = sort + scope.launch { + val got = withContext(Dispatchers.IO) { + runCatching { WowAddonCatalog.search(context, WowAddonCatalog.Query(words, cat, WowAddonCatalog.client(into), order), page) } + } + got.onSuccess { + if (page == 0) results.items.clear() + results.items.addAll(it.items.filter { addon -> results.items.none { seen -> seen.id == addon.id } }) + results.page = page + results.more = it.more + }.onFailure { results.failed = it.message ?: it.javaClass.simpleName } + results.loading = false + } + } + LaunchedEffect(results) { + if (text.isNotEmpty()) delay(350) + load(0) + } + fun install(addon: WowAddonCatalog.Addon) { + val key = installKey(addon, target) + if (key in installing) return + if (SessionState.running) { + Toast.makeText(context, R.string.main_addons_close_session, Toast.LENGTH_LONG).show() + return + } + val into = target + installing[key] = 0 + scope.launch { + val message = withContext(Dispatchers.IO) { installAddon(context, addon, into) { pct -> scope.launch { if (key in installing) installing[key] = pct } } } + installing.remove(key) + if (message.second) installed[key] = true + Toast.makeText(context, message.first, Toast.LENGTH_LONG).show() + } + } + val sourceName = stringResource(R.string.addons_source_wowi) + AppDialog(shown, close, "addonBrowser", wide = true, scrollable = false) { + DialogTitleRow(stringResource(R.string.addons_download), close) + ModeHeader(sourceName, text, { text = it }, stringResource(R.string.stores_search_catalog, sourceName)) { + BrowseChip(stringResource(R.string.addons_source_curse), false) { + runCatching { context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(WowAddonCatalog.curseForgeUrl(text))).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) } + } + } + ChipRow { + BrowseDropdown(sortLabel(sort)) { first, done -> + WowAddonCatalog.Sort.entries.forEachIndexed { index, option -> + MenuItem(sortLabel(option), sort == option, focusRequester = if (index == 0) first else null) { sort = option; done() } + } + } + if (categories.isNotEmpty()) BrowseDropdown(category?.name ?: stringResource(R.string.addons_category_all)) { first, done -> + MenuItem(stringResource(R.string.addons_category_all), category == null, focusRequester = first) { category = null; done() } + categories.forEach { option -> MenuItem(option.name, category?.id == option.id) { category = option; done() } } + } + if (targets.size > 1) BrowseDropdown(target.flavor) { first, done -> + targets.forEachIndexed { index, option -> + MenuItem(option.flavor, option.addOns == target.addOns, focusRequester = if (index == 0) first else null) { target = option; done() } + } + } + } + val height = (LocalConfiguration.current.screenHeightDp * 0.62f).dp + LazyVerticalGrid( + GridCells.Adaptive(libraryTileWidth() + 40.dp), Modifier.fillMaxWidth().height(height), + horizontalArrangement = Arrangement.spacedBy(10.dp), verticalArrangement = Arrangement.spacedBy(10.dp), + ) { + items(results.items, key = { it.id }) { addon -> + AddonCard(addon, installing[installKey(addon, target)], installed[installKey(addon, target)] == true) { install(addon) } + } + item(key = "tail", span = { GridItemSpan(maxLineSpan) }) { + Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + when { + results.loading -> LinearProgressIndicator(Modifier.fillMaxWidth()) + results.failed != null -> BrowseChip(stringResource(R.string.stores_dl_retry), false) { load(if (results.items.isEmpty()) 0 else results.page + 1) } + results.more -> BrowseChip(stringResource(R.string.stores_itch_load_more), false) { load(results.page + 1) } + results.items.isEmpty() -> Text(stringResource(R.string.addons_none_found), fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + } + } + } + } + } +} + +@Composable +private fun AddonCard(addon: WowAddonCatalog.Addon, progress: Int?, done: Boolean, onInstall: () -> Unit) { + val pal = LocalPalette.current + val src = remember { androidx.compose.foundation.interaction.MutableInteractionSource() } + val hot = rememberHot(src) + val shape = androidx.compose.foundation.shape.RoundedCornerShape(10.dp) + Column( + Modifier.fillMaxWidth().clip(shape).glideBorder(hot, shape, pal.signal, pal.line) + .hoverable(src) + .clickable(interactionSource = src, indication = LocalIndication.current, role = Role.Button, onClick = onInstall) + .controllerConfirm(onClick = onInstall), + ) { + ArtCard(addon.name, addon.thumb, null, null, hot, capsule = false, chip = progress?.let { "$it%" }) { + if (done) Icon(Icons.Filled.Check, stringResource(R.string.stores_installed_chip), tint = pal.good, modifier = Modifier.height(11.dp)) + else Text(stringResource(if (progress != null) R.string.store_installing else R.string.store_install), fontSize = 10.sp, color = pal.signal, maxLines = 1) + } + Text( + listOf(addon.author, formatCount(addon.downloads)).filter { it.isNotEmpty() }.joinToString(" · "), + fontSize = 11.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(horizontal = 8.dp, vertical = 6.dp), + ) + } +} + +@Composable +private fun sortLabel(sort: WowAddonCatalog.Sort): String = stringResource( + when (sort) { + WowAddonCatalog.Sort.POPULAR -> R.string.stores_itch_sort_popular + WowAddonCatalog.Sort.UPDATED -> R.string.stores_itch_sort_new + WowAddonCatalog.Sort.NAME -> R.string.addons_sort_name + WowAddonCatalog.Sort.DOWNLOADS -> R.string.addons_sort_downloads + }, +) + +private fun formatCount(count: Long): String = when { + count <= 0 -> "" + count >= 1_000_000 -> String.format(java.util.Locale.getDefault(), "%.1fM", count / 1_000_000.0) + count >= 1_000 -> String.format(java.util.Locale.getDefault(), "%.1fK", count / 1_000.0) + else -> count.toString() +} + +private fun installAddon(context: Context, addon: WowAddonCatalog.Addon, target: WowAddons.Target, progress: (Int) -> Unit): Pair { + val zip = File(File(context.cacheDir, "wowaddons"), "download-wowi-${addon.id.filter(Char::isLetterOrDigit)}-${java.util.UUID.randomUUID()}.zip") + return try { + WowAddonCatalog.download(context, addon, zip, progress) + if (SessionState.running) return context.getString(R.string.main_addons_close_session) to false + val names = WowAddons.import(zip, target) + if (names.isEmpty()) context.getString(R.string.main_addons_none, addon.name) to false + else context.resources.getQuantityString(R.plurals.main_addons_imported, names.size, names.size, target.flavor) to true + } catch (_: WowAddons.TooLarge) { + context.getString(R.string.main_addons_too_large, addon.name) to false + } catch (e: Exception) { + context.getString(R.string.stores_dl_failed_reason, e.message ?: e.javaClass.simpleName) to false + } finally { + zip.delete() + } +} + +private fun installKey(addon: WowAddonCatalog.Addon, target: WowAddons.Target) = addon.id + "|" + target.addOns.path 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 390295f696..808c944858 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/GameDetail.kt @@ -874,12 +874,15 @@ private fun SavesTab(g: Library.SteamGame, prefix: File, a: FrontEndActions) { @Composable private fun AddonsTab(g: Library.SteamGame, targets: List, a: FrontEndActions) { + var browsing by remember(g.gameId) { mutableStateOf(null) } + browsing?.let { AddonBrowserDialog(targets, it) { browsing = null } } Column(Modifier.fillMaxWidth().tabPanel(), verticalArrangement = Arrangement.spacedBy(2.dp)) { targets.forEach { target -> val names by produceState(emptyList(), target.addOns, WowAddons.imports) { value = withContext(Dispatchers.IO) { WowAddons.installed(target) } } if (targets.size > 1) SectionLabel(target.flavor) + MenuItem(stringResource(R.string.addons_download), checked = false) { browsing = target } MenuItem( stringResource(R.string.games_import_addons), checked = false, detail = pluralStringResource(R.plurals.games_addons_count, names.size, names.size), diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index e30264a8c9..981fa0c531 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3851,4 +3851,11 @@ جارٍ الاستماع… الكتابة بالصوت غير متاحة على هذا الجهاز. يلزم الوصول إلى الميكروفون للكتابة بالصوت. + تنزيل الإضافات… + الاسم + الأكثر تنزيلًا + كل الفئات + لم يتم العثور على إضافات + تعذّر الوصول إلى %1$s + لا يوجد ملف لإصدار اللعبة هذا 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 136e794fea..fbebf8a021 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3707,4 +3707,11 @@ Escuchando… El dictado por voz no está disponible en este dispositivo. Se necesita acceso al micrófono para el dictado por voz. + Descargar complementos… + Nombre + Más descargados + Todas las categorías + No se encontraron complementos + No se pudo conectar con %1$s + No hay archivo para esta versión del juego diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8da4aaf70e..08a5142f8f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3695,4 +3695,11 @@ Слушане… Гласовото въвеждане не е налично на това устройство. За гласово въвеждане е нужен достъп до микрофона. + Изтегляне на добавки… + Име + Най-изтегляни + Всички категории + Няма намерени добавки + Няма връзка с %1$s + Няма файл за тази версия на играта diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ddeaa7c70f..82b7f3cc9b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3773,4 +3773,11 @@ Poslouchám… Hlasové psaní není na tomto zařízení k dispozici. Pro hlasové psaní je potřeba přístup k mikrofonu. + Stáhnout doplňky… + Název + Nejstahovanější + Všechny kategorie + Nenalezeny žádné doplňky + Nelze se připojit k %1$s + Pro tuto verzi hry není k dispozici soubor diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7ec22ce50f..9aed4b892c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3695,4 +3695,11 @@ Lytter… Stemmeindtastning er ikke tilgængelig på denne enhed. Mikrofonadgang er nødvendig for stemmeindtastning. + Download tilføjelser… + Navn + Mest downloadet + Alle kategorier + Ingen tilføjelser fundet + Kunne ikke nå %1$s + Ingen fil til denne spilversion diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e0fbbf939b..6c2b71c3ca 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3695,4 +3695,11 @@ Hört zu… Spracheingabe ist auf diesem Gerät nicht verfügbar. Für die Spracheingabe wird Mikrofonzugriff benötigt. + Addons herunterladen… + Name + Meistgeladen + Alle Kategorien + Keine Addons gefunden + %1$s ist nicht erreichbar + Keine Datei für diese Spielversion diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 016bd6e154..a18bdc7463 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3695,4 +3695,11 @@ Ακρόαση… Η φωνητική πληκτρολόγηση δεν είναι διαθέσιμη σε αυτή τη συσκευή. Απαιτείται πρόσβαση στο μικρόφωνο για φωνητική πληκτρολόγηση. + Λήψη πρόσθετων… + Όνομα + Περισσότερες λήψεις + Όλες οι κατηγορίες + Δεν βρέθηκαν πρόσθετα + Δεν ήταν δυνατή η σύνδεση με %1$s + Δεν υπάρχει αρχείο για αυτή την έκδοση του παιχνιδιού diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e71e23af37..39e497d809 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3734,4 +3734,11 @@ Escuchando… El dictado por voz no está disponible en este dispositivo. Se necesita acceso al micrófono para el dictado por voz. + Descargar complementos… + Nombre + Más descargados + Todas las categorías + No se han encontrado complementos + No se pudo conectar con %1$s + No hay ningún archivo para esta versión del juego diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2c1004c4ee..b4fcab84bc 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3695,4 +3695,11 @@ Kuunnellaan… Puhekirjoitus ei ole käytettävissä tällä laitteella. Puhekirjoitus vaatii mikrofonin käyttöoikeuden. + Lataa lisäosia… + Nimi + Ladatuimmat + Kaikki luokat + Lisäosia ei löytynyt + Yhteyttä palveluun %1$s ei saatu + Tälle peliversiolle ei ole tiedostoa diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aba9e23d53..d3903342d4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3734,4 +3734,11 @@ Écoute… La saisie vocale n\'est pas disponible sur cet appareil. L\'accès au micro est nécessaire pour la saisie vocale. + Télécharger des addons… + Nom + Les plus téléchargés + Toutes les catégories + Aucun addon trouvé + Impossible de joindre %1$s + Aucun fichier pour cette version du jeu diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e25ff3d649..66de8835b6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3695,4 +3695,11 @@ सुन रहा है… इस डिवाइस पर आवाज़ से टाइपिंग उपलब्ध नहीं है। आवाज़ से टाइपिंग के लिए माइक्रोफ़ोन की अनुमति चाहिए। + ऐडऑन डाउनलोड करें… + नाम + सबसे ज़्यादा डाउनलोड + सभी श्रेणियाँ + कोई ऐडऑन नहीं मिला + %1$s तक नहीं पहुँच सके + गेम के इस संस्करण के लिए कोई फ़ाइल नहीं है diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f432f7fe7d..76d7ffd4f7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3695,4 +3695,11 @@ Figyelés… A hangalapú gépelés nem érhető el ezen az eszközön. A hangalapú gépeléshez mikrofon-hozzáférés szükséges. + Kiegészítők letöltése… + Név + Legtöbbet letöltött + Minden kategória + Nem található kiegészítő + A(z) %1$s nem érhető el + Nincs fájl ehhez a játékverzióhoz diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 4c09386e44..d5f24eabdf 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3665,4 +3665,11 @@ Mendengarkan… Ketik dengan suara tidak tersedia di perangkat ini. Akses mikrofon diperlukan untuk mengetik dengan suara. + Unduh addon… + Nama + Paling banyak diunduh + Semua kategori + Tidak ada addon ditemukan + Tidak dapat menjangkau %1$s + Tidak ada file untuk versi game ini diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8d67e96c22..2a6b8c5c83 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3734,4 +3734,11 @@ In ascolto… La digitazione vocale non è disponibile su questo dispositivo. Per la digitazione vocale serve l\'accesso al microfono. + Scarica addon… + Nome + Più scaricati + Tutte le categorie + Nessun addon trovato + Impossibile raggiungere %1$s + Nessun file per questa versione del gioco diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 275af4f8d5..e16e785603 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3665,4 +3665,11 @@ 聞き取り中… このデバイスでは音声入力を使用できません。 音声入力にはマイクへのアクセスが必要です。 + アドオンをダウンロード… + 名前 + ダウンロード数順 + すべてのカテゴリ + アドオンが見つかりません + %1$s に接続できませんでした + このゲームバージョン用のファイルがありません diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0718a4038c..9693ab2649 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3665,4 +3665,11 @@ 듣는 중… 이 기기에서는 음성 입력을 사용할 수 없습니다. 음성 입력을 하려면 마이크 접근 권한이 필요합니다. + 애드온 다운로드… + 이름 + 다운로드 많은 순 + 모든 카테고리 + 애드온을 찾을 수 없음 + %1$s에 연결할 수 없습니다 + 이 게임 버전용 파일이 없습니다 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 9a9e5f3dbc..3c73fff281 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3665,4 +3665,11 @@ Mendengar… Taip dengan suara tidak tersedia pada peranti ini. Akses mikrofon diperlukan untuk menaip dengan suara. + Muat turun addon… + Nama + Paling banyak dimuat turun + Semua kategori + Tiada addon ditemui + Tidak dapat mencapai %1$s + Tiada fail untuk versi permainan ini diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 0609a04547..904e587770 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3695,4 +3695,11 @@ Lytter… Taleinntasting er ikke tilgjengelig på denne enheten. Mikrofontilgang trengs for taleinntasting. + Last ned tillegg… + Navn + Mest nedlastet + Alle kategorier + Fant ingen tillegg + Fikk ikke kontakt med %1$s + Ingen fil for denne spillversjonen diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9e2c6c8740..f515e6c210 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3695,4 +3695,11 @@ Luisteren… Spraakinvoer is niet beschikbaar op dit apparaat. Voor spraakinvoer is toegang tot de microfoon nodig. + Add-ons downloaden… + Naam + Meest gedownload + Alle categorieën + Geen add-ons gevonden + Kan %1$s niet bereiken + Geen bestand voor deze gameversie diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 64e5969cd2..8289c5a3e7 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3773,4 +3773,11 @@ Słucham… Pisanie głosowe nie jest dostępne na tym urządzeniu. Pisanie głosowe wymaga dostępu do mikrofonu. + Pobierz dodatki… + Nazwa + Najczęściej pobierane + Wszystkie kategorie + Nie znaleziono dodatków + Nie można połączyć się z %1$s + Brak pliku dla tej wersji gry diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index c7cc165c6f..21ebba5ae7 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3734,4 +3734,11 @@ A ouvir… A escrita por voz não está disponível neste dispositivo. É necessário acesso ao microfone para a escrita por voz. + Transferir addons… + Nome + Mais transferidos + Todas as categorias + Nenhum addon encontrado + Não foi possível contactar %1$s + Não há ficheiro para esta versão do jogo diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index ce848258e6..fcbc14cbed 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3734,4 +3734,11 @@ Ouvindo… A digitação por voz não está disponível neste dispositivo. É preciso acesso ao microfone para a digitação por voz. + Baixar addons… + Nome + Mais baixados + Todas as categorias + Nenhum addon encontrado + Não foi possível acessar %1$s + Não há arquivo para esta versão do jogo diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2d8aba6a8b..ce237fd14a 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3734,4 +3734,11 @@ Se ascultă… Tastarea vocală nu este disponibilă pe acest dispozitiv. Pentru tastarea vocală este necesar accesul la microfon. + Descarcă suplimente… + Nume + Cele mai descărcate + Toate categoriile + Nu s-au găsit suplimente + Nu s-a putut accesa %1$s + Nu există fișier pentru această versiune a jocului diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index a9639bacdb..b97c503033 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3856,4 +3856,11 @@ Слушаю… Голосовой ввод недоступен на этом устройстве. Для голосового ввода нужен доступ к микрофону. + Скачать аддоны… + Название + Самые скачиваемые + Все категории + Аддоны не найдены + Не удалось подключиться к %1$s + Нет файла для этой версии игры diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 7def460385..b46f04d83b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3695,4 +3695,11 @@ Lyssnar… Röstinmatning är inte tillgänglig på den här enheten. Mikrofonåtkomst krävs för röstinmatning. + Ladda ner tillägg… + Namn + Mest nedladdade + Alla kategorier + Inga tillägg hittades + Kunde inte nå %1$s + Ingen fil för den här spelversionen diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index fed46567d0..69b4fed017 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3665,4 +3665,11 @@ กำลังฟัง… อุปกรณ์นี้ไม่รองรับการพิมพ์ด้วยเสียง ต้องอนุญาตให้เข้าถึงไมโครโฟนเพื่อพิมพ์ด้วยเสียง + ดาวน์โหลดแอดออน… + ชื่อ + ดาวน์โหลดมากที่สุด + ทุกหมวดหมู่ + ไม่พบแอดออน + ไม่สามารถเชื่อมต่อ %1$s ได้ + ไม่มีไฟล์สำหรับเกมเวอร์ชันนี้ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5b90116e59..21b45f6080 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3695,4 +3695,11 @@ Dinleniyor… Sesle yazma bu cihazda kullanılamıyor. Sesle yazma için mikrofon erişimi gerekiyor. + Eklenti indir… + Ad + En çok indirilen + Tüm kategoriler + Eklenti bulunamadı + %1$s adresine ulaşılamadı + Bu oyun sürümü için dosya yok diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 106ea6fb71..9f67b3e838 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3773,4 +3773,11 @@ Слухаю… Голосове введення недоступне на цьому пристрої. Для голосового введення потрібен доступ до мікрофона. + Завантажити аддони… + Назва + Найбільше завантажень + Усі категорії + Аддонів не знайдено + Не вдалося під’єднатися до %1$s + Немає файлу для цієї версії гри diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 70ec3a7cea..ad82e08825 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3665,4 +3665,11 @@ Đang nghe… Thiết bị này không hỗ trợ nhập bằng giọng nói. Cần quyền truy cập micrô để nhập bằng giọng nói. + Tải addon… + Tên + Tải nhiều nhất + Tất cả danh mục + Không tìm thấy addon + Không thể kết nối tới %1$s + Không có tệp cho phiên bản trò chơi này diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5fc4e023bb..b9e5750c20 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3669,4 +3669,11 @@ 正在聆听… 此设备不支持语音输入。 语音输入需要麦克风权限。 + 下载插件… + 名称 + 下载最多 + 所有类别 + 未找到插件 + 无法连接到 %1$s + 没有适用于此游戏版本的文件 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 3259145f3c..6bba51eb7b 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3668,4 +3668,11 @@ 正在聆聽… 此裝置不支援語音輸入。 語音輸入需要咪高峰權限。 + 下載插件… + 名稱 + 下載最多 + 所有類別 + 找不到插件 + 無法連接 %1$s + 沒有適用於此遊戲版本的檔案 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 748e99c7fd..d6b85d4e67 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3668,4 +3668,11 @@ 正在聆聽… 此裝置不支援語音輸入。 語音輸入需要麥克風權限。 + 下載插件… + 名稱 + 下載最多 + 所有類別 + 找不到插件 + 無法連線至 %1$s + 沒有適用於此遊戲版本的檔案 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d2f7d89528..1560dfcd47 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3853,4 +3853,13 @@ Listening… Voice typing is not available on this device. Microphone access is needed for voice typing. + Download addons… + Name + Most downloaded + All categories + No addons found + Could not reach %1$s + No file for this game version + WoWInterface + CurseForge diff --git a/app/src/test/java/com/droiddeck/launcher/runtime/WowAddonCatalogTest.kt b/app/src/test/java/com/droiddeck/launcher/runtime/WowAddonCatalogTest.kt new file mode 100644 index 0000000000..43bb29bb48 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/runtime/WowAddonCatalogTest.kt @@ -0,0 +1,199 @@ +package com.droiddeck.launcher.runtime + +import android.app.Application +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class) +class WowAddonCatalogTest { + private val context get() = RuntimeEnvironment.getApplication() + + private val files = """[ + {"UID":"1","UICATID":"19","UIVersion":"1.0","UIDate":300,"UIName":"Bartender","UIAuthorName":"Nevcairiel","UIDownloadTotal":"500","UICompatibility":[{"version":"12.0.0","name":"Midnight"}],"UIIMG_Thumbs":["https://cdn.example/a.jpg"]}, + {"UID":"2","UICATID":"20","UIVersion":"2.0","UIDate":100,"UIName":"Zygor","UIAuthorName":"Kappa","UIDownloadTotal":"900","UICompatibility":[{"version":"1.15.7","name":"Classic"},{"version":"4.4.2","name":"Cataclysm Classic"}],"UIIMG_Thumbs":null}, + {"UID":"3","UICATID":"21","UIVersion":"3.0","UIDate":200,"UIName":"Alpha","UIAuthorName":"bartuser","UIDownloadTotal":"10","UIDownloadMonthly":"9","UICompatibility":null}, + {"UID":"4","UICATID":"19","UIVersion":"4.0","UIDate":400,"UIName":"TBCOnly","UIAuthorName":"x","UIDownloadTotal":"20","UIDownloadMonthly":"5","UICompatibility":[{"version":"2.5.4","name":"The Burning Crusade Classic"}]} + ]""" + + private val cats = """[ + {"UICATID":"19","UICATTitle":"Action Bar Mods","UICATParentIDs":["0","23"]}, + {"UICATID":"20","UICATTitle":"Bags","UICATParentIDs":["0","23"]}, + {"UICATID":"21","UICATTitle":"Child","UICATParentIDs":["0","20"]} + ]""" + + private fun c(folder: String, version: String? = null) = WowAddonCatalog.client(folder, version) + + private fun run(q: WowAddonCatalog.Query) = WowAddonCatalog.filterWowi(WowAddonCatalog.parseWowiFiles(files), WowAddonCatalog.parseWowiCategories(cats), q).map { it.id } + + @Test fun parsesFileListEntries() { + val e = WowAddonCatalog.parseWowiFiles(files) + assertEquals(4, e.size) + val a = e[0].addon + assertEquals("Bartender", a.name) + assertEquals("Nevcairiel", a.author) + assertEquals(500L, a.downloads) + assertEquals(300L, a.updated) + assertEquals("https://cdn.example/a.jpg", a.thumb) + assertNull(e[1].addon.thumb) + assertEquals("19", e[0].category) + } + + @Test fun versionsMapToFlavors() { + assertEquals("_retail_", WowAddonCatalog.flavorOf("12.1.0")) + assertEquals("_retail_", WowAddonCatalog.flavorOf("11.0.5")) + assertEquals("_classic_era_", WowAddonCatalog.flavorOf("1.15.7")) + assertEquals("_anniversary_", WowAddonCatalog.flavorOf("2.5.4")) + assertEquals("_classic_", WowAddonCatalog.flavorOf("4.4.2")) + assertNull(WowAddonCatalog.flavorOf("9.2.7")) + } + + @Test fun flavorFilterKeepsNullCompatibilityEverywhere() { + assertEquals(setOf("1", "3"), run(WowAddonCatalog.Query(client = c("_retail_"))).toSet()) + assertEquals(setOf("2", "3"), run(WowAddonCatalog.Query(client = c("_classic_era_"))).toSet()) + assertEquals(setOf("2", "3"), run(WowAddonCatalog.Query(client = c("_classic_"))).toSet()) + assertEquals(setOf("3", "4"), run(WowAddonCatalog.Query(client = c("_anniversary_"))).toSet()) + } + + @Test fun categoryIncludesChildren() { + assertEquals(setOf("2", "3"), run(WowAddonCatalog.Query(category = "20", client = c("_classic_"))).toSet()) + assertEquals(setOf("3"), run(WowAddonCatalog.Query(category = "21", client = c("_classic_"))).toSet()) + assertEquals(setOf("1"), run(WowAddonCatalog.Query(category = "19", client = c("_retail_"))).toSet()) + } + + @Test fun textMatchesNameOrAuthorIgnoringCase() { + assertEquals(setOf("1", "3"), run(WowAddonCatalog.Query(text = "BART", client = c("_retail_"))).toSet()) + assertEquals(listOf("2"), run(WowAddonCatalog.Query(text = "kappa", client = c("_classic_era_")))) + } + + @Test fun sortOrders() { + val f = "_anniversary_" + assertEquals(listOf("3", "4"), run(WowAddonCatalog.Query(client = c(f), sort = WowAddonCatalog.Sort.POPULAR))) + assertEquals(listOf("4", "3"), run(WowAddonCatalog.Query(client = c(f), sort = WowAddonCatalog.Sort.DOWNLOADS))) + assertEquals(listOf("4", "3"), run(WowAddonCatalog.Query(client = c(f), sort = WowAddonCatalog.Sort.UPDATED))) + assertEquals(listOf("3", "4"), run(WowAddonCatalog.Query(client = c(f), sort = WowAddonCatalog.Sort.NAME))) + assertEquals(listOf("2", "1", "4", "3"), WowAddonCatalog.filterWowi( + WowAddonCatalog.parseWowiFiles(files).map { WowAddonCatalog.Entry(it.addon, it.category, null) }, emptyList(), + WowAddonCatalog.Query(client = c(f), sort = WowAddonCatalog.Sort.DOWNLOADS), + ).map { it.id }) + } + + @Test fun pagingReportsMore() { + val all = WowAddonCatalog.parseWowiFiles(files).map { it.addon } + val p0 = WowAddonCatalog.pageOf(all, 0, 3) + assertEquals(3, p0.items.size) + assertTrue(p0.more) + val p1 = WowAddonCatalog.pageOf(all, 1, 3) + assertEquals(1, p1.items.size) + assertFalse(p1.more) + assertTrue(WowAddonCatalog.pageOf(all, 5, 3).items.isEmpty()) + } + + @Test fun clientVersionDecidesTheFamilyBeforeTheFolderName() { + assertEquals("_retail_", c("_forever_").family) + assertEquals("_classic_era_", c("_forever_", "1.15.8.61000").family) + assertEquals("_classic_era_", c("_anniversary_", "1.15.7.60000").family) + assertEquals("_classic_", c("_classic_beta_").family) + assertEquals("_retail_", c("_retail_ptr_").family) + assertNull(c("_mystery_").family) + assertEquals("_anniversary_", c("_mystery_", "2.5.5.1").family) + } + + @Test fun foreverShowsMainlineAddonsAndHidesClassicOnlyOnes() { + assertEquals(setOf("1", "3"), run(WowAddonCatalog.Query(client = c("_forever_"))).toSet()) + assertEquals(setOf("2", "3"), run(WowAddonCatalog.Query(client = c("_forever_", "1.15.8.1"))).toSet()) + } + + @Test fun unknownFamilyShowsEverything() { + assertEquals(setOf("1", "2", "3", "4"), run(WowAddonCatalog.Query(client = c("_mystery_"))).toSet()) + } + + private val buildInfo = """Branch!STRING:0|Active!DEC:1|Build Key!HEX:16|CDN Key!HEX:16|Install Key!HEX:16|IM Size!DEC:4|CDN Path!STRING:0|CDN Hosts!STRING:0|CDN Servers!STRING:0|Tags!STRING:0|Armadillo!STRING:0|Last Activated!STRING:0|Version!STRING:0|KeyRing!HEX:16|Product!STRING:0 +us|1|aa|bb|cc||tpr/wow|h|s|t||1|12.0.7.64000|kk|wow +us|1|aa|bb|cc||tpr/wow|h|s|t||1|1.15.8.63000|kk|wow_classic_era +us|1|aa|bb|cc||tpr/wow|h|s|t||1|12.1.0.65000|kk|wowf +""" + + @Test fun buildInfoAndFlavorInfoGiveTheInstalledVersion() { + assertEquals("12.1.0.65000", WowAddonCatalog.buildInfoVersion(buildInfo, "wowf")) + assertEquals("1.15.8.63000", WowAddonCatalog.buildInfoVersion(buildInfo.replace("\n", "\r\n"), "WOW_CLASSIC_ERA")) + assertNull(WowAddonCatalog.buildInfoVersion(buildInfo, "wow_beta")) + assertNull(WowAddonCatalog.buildInfoVersion("garbage", "wow")) + assertNull(WowAddonCatalog.buildInfoVersion("", "wow")) + assertEquals("wowf", WowAddonCatalog.flavorProduct("Product Flavor!STRING:0\nwowf\n")) + assertNull(WowAddonCatalog.flavorProduct("Product Flavor!STRING:0\n")) + } + + @Test fun clientReadsTheInstallOnDisk() { + val root = File(context.cacheDir, "wowaddon-client-test") + val flavor = File(root, "_forever_") + File(flavor, "Interface/AddOns").mkdirs() + File(root, ".build.info").writeText(buildInfo.replace("12.1.0.65000", "1.15.9.1")) + File(flavor, ".flavor.info").writeText("Product Flavor!STRING:0\nwowf\n") + val target = WowAddons.Target("_forever_", File(flavor, "Interface/AddOns")) + assertEquals("1.15.9.1", WowAddonCatalog.clientVersion(flavor)) + assertEquals("_classic_era_", WowAddonCatalog.client(target).family) + File(flavor, ".flavor.info").delete() + assertNull(WowAddonCatalog.clientVersion(flavor)) + assertEquals("_retail_", WowAddonCatalog.client(target).family) + File(root, ".build.info").delete() + File(flavor, "Interface/AddOns").delete() + File(flavor, "Interface").delete() + flavor.delete() + root.delete() + } + + @Test fun wowiDetailsGiveUrlAndMd5() { + val d = WowAddonCatalog.parseWowiDetails("""[{"UID":"1","UIMD5":"abc","UIDownload":"https://cdn.wowinterface.com/downloads/getfile.php?id=1"}]""") + assertEquals("https://cdn.wowinterface.com/downloads/getfile.php?id=1", d?.first) + assertEquals("abc", d?.second) + assertNull(WowAddonCatalog.parseWowiDetails("""[{"UID":"1","UIDownload":""}]""")) + assertNull(WowAddonCatalog.parseWowiDetails("[]")) + } + + @Test fun nonHttpsDownloadsAreRefused() { + assertFalse(WowAddonCatalog.isHttps("http://example.com/a.zip")) + assertFalse(WowAddonCatalog.isHttps("file:///etc/passwd")) + assertTrue(WowAddonCatalog.isHttps("https://example.com/a.zip")) + } + + @Test fun curseForgeUrlAddsTheSearchText() { + assertEquals("https://www.curseforge.com/wow/search?class=addons", WowAddonCatalog.curseForgeUrl(" ")) + assertEquals("https://www.curseforge.com/wow/search?class=addons&search=deadly+boss+%26+mods", WowAddonCatalog.curseForgeUrl(" deadly boss & mods ")) + } + + @Test fun md5Check() { + val f = File(context.cacheDir, "wowaddon-md5-test.zip") + f.writeText("hello") + assertFalse(WowAddonCatalog.md5Matches(f, "00000000000000000000000000000000")) + assertTrue(WowAddonCatalog.md5Matches(f, "5D41402ABC4B2A76B9719D911017C592")) + assertTrue(WowAddonCatalog.md5Matches(f, null)) + f.delete() + } + + @Test fun aFreshBodyIsReturnedWhenTheCacheCannotBeWritten() { + val blocker = File(context.cacheDir, "wowaddon-cache-blocker").apply { parentFile!!.mkdirs(); writeText("") } + assertEquals("[1]", WowAddonCatalog.cached(File(blocker, "x.json"), 1_000L) { "[1]" }) + blocker.delete() + } + + @Test fun staleCacheIsUsedWhenOfflineAndFreshCacheSkipsTheNetwork() { + val f = File(context.cacheDir, "wowaddon-cache-test/x.json") + assertEquals("[1]", WowAddonCatalog.cached(f, 1_000L) { "[1]" }) + assertEquals("[1]", WowAddonCatalog.cached(f, 2_000L) { "[2]" }) + val later = 1_000L + WowAddonCatalog.FRESH_MS + 1 + assertEquals("[2]", WowAddonCatalog.cached(f, later) { "[2]" }) + assertEquals("[2]", WowAddonCatalog.cached(f, later + WowAddonCatalog.FRESH_MS * 2) { null }) + assertEquals("[2]", WowAddonCatalog.cached(f, later * 4) { "busy" }) + assertEquals("[2]", WowAddonCatalog.cached(f, later * 4) { "{\"error\":\"busy\"}" }) + f.writeText("[2") + assertEquals("[3]", WowAddonCatalog.cached(f, later * 4 + 1) { "[3]" }) + assertEquals(listOf("x.json"), f.parentFile!!.list()!!.toList()) + f.delete() + } +}