diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index ba0d2e88c0..d64855f508 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -24,15 +24,22 @@ internal class BrowsePage(val items: List, val code: Int, val cache internal object ItchBrowse { const val SORT_POPULAR = "popular" - const val SORT_NEW = "new" - const val SORT_TOP_RATED = "top-rated" + const val SORT_NEW_POPULAR = "new-and-popular" const val SORT_TOP_SELLERS = "top-sellers" - val sorts = listOf(SORT_POPULAR, SORT_NEW, SORT_TOP_RATED, SORT_TOP_SELLERS) + const val SORT_TOP_RATED = "top-rated" + const val SORT_NEWEST = "newest" + val sorts = listOf(SORT_POPULAR, SORT_NEW_POPULAR, SORT_TOP_SELLERS, SORT_TOP_RATED, SORT_NEWEST) const val PRICE_ANY = "any" const val PRICE_FREE = "free" - const val PRICE_SALE = "sale" - val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE) + const val PRICE_SALE = "on-sale" + const val PRICE_PAID = "store" + const val PRICE_UNDER_5 = "5-dollars-or-less" + const val PRICE_UNDER_15 = "15-dollars-or-less" + val prices = listOf(PRICE_ANY, PRICE_FREE, PRICE_SALE, PRICE_PAID, PRICE_UNDER_5, PRICE_UNDER_15) + + /** Platform names as itch spells them in `platform-`. */ + val platformNames = listOf("windows", "osx", "linux", "android", "ios", "web", "mobile-web") private const val BASE = "https://itch.io/games" private const val FRESH_MS = 3 * 60 * 60 * 1000L @@ -43,52 +50,34 @@ internal object ItchBrowse { @Volatile private var lastRequestAt = 0L private val lock = Any() - private fun sortSegment(sort: String): String? = when (sort) { - SORT_NEW -> "newest" - SORT_TOP_RATED -> "top-rated" - SORT_TOP_SELLERS -> "top-sellers" - else -> null - } + /** The path piece itch uses for each choice; the default sort and price have none. */ + private fun sortSegment(sort: String): String? = sort.takeIf { it != SORT_POPULAR && it in sorts } - /** The ways itch spells a price filter; the first that answers is used, so one wrong guess does not empty the tab. */ - private fun priceSegments(price: String): List = when (price) { - PRICE_FREE -> listOf("free", "price-free") - PRICE_SALE -> listOf("on-sale") - else -> listOf(null) - } + private fun priceSegment(price: String): String? = price.takeIf { it != PRICE_ANY && it in prices } - /** Every feed URL that could answer [query] for [page], most likely first. */ - fun urls(query: BrowseQuery, page: Int): List = priceSegments(query.price).map { price -> - val segments = listOfNotNull(sortSegment(query.sort), price) + + /** The address of [query]'s page on itch: sort, price, platforms, then tags, as itch's own links spell them. */ + fun path(query: BrowseQuery): String { + val segments = listOfNotNull(sortSegment(query.sort), priceSegment(query.price)) + query.platforms.sorted().map { "platform-$it" } + query.tags.map { "tag-" + tagSlug(it) } - val path = if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") - path + ".xml" + if (page > 1) "?page=$page" else "" + return if (segments.isEmpty()) BASE else BASE + "/" + segments.joinToString("/") } + /** The listing feed for [query]'s [page]. */ + fun url(query: BrowseQuery, page: Int): String = path(query) + ".xml" + if (page > 1) "?page=$page" else "" + fun tagSlug(tag: String): String = tag.trim().lowercase().replace(Regex("[^a-z0-9]+"), "-").trim('-') /** Page [page] of [query]: the disk copy when it is fresh, otherwise the feed, one request at a time and spaced out. */ fun page(context: Context, query: BrowseQuery, page: Int, force: Boolean = false): BrowsePage { val app = context.applicationContext - val candidates = urls(query, page) - if (!force) for (url in candidates) { - val stored = read(app, url) ?: continue - return BrowsePage(stored, 200, true) - } - var code = 0 - for (url in candidates) { - val (status, body) = fetch(url) - code = status - if (status !in 200..299 || body == null) continue - val items = ItchShelves.parse(body) - StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") - if (items.isEmpty()) continue - write(app, url, items) - return BrowsePage(items, status, false) - } - StoresState.logLine("itch.io browse: ${candidates.first()} gave nothing (last status $code)") - return BrowsePage(emptyList(), code, false) + val url = url(query, page) + if (!force) read(app, url)?.let { return BrowsePage(it, 200, true) } + val (status, body) = fetch(url) + val items = if (status in 200..299 && body != null) ItchShelves.parse(body) else emptyList() + StoresState.logLine("itch.io browse: $url answered $status with ${items.size} games") + if (items.isNotEmpty()) write(app, url, items) + return BrowsePage(items, status, false) } private fun fetch(url: String): Pair { diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 44852c4df8..896d1b37f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -90,9 +90,10 @@ private fun BrowseChip(label: String, selected: Boolean, onClick: () -> Unit) { @Composable private fun sortLabel(sort: String): String = stringResource( when (sort) { - ItchBrowse.SORT_NEW -> R.string.stores_itch_sort_new - ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_NEW_POPULAR -> R.string.stores_itch_sort_new_popular ItchBrowse.SORT_TOP_SELLERS -> R.string.stores_itch_sort_top_sellers + ItchBrowse.SORT_TOP_RATED -> R.string.stores_itch_sort_top_rated + ItchBrowse.SORT_NEWEST -> R.string.stores_itch_sort_new else -> R.string.stores_itch_sort_popular }, ) @@ -102,6 +103,9 @@ private fun priceLabel(price: String): String = stringResource( when (price) { ItchBrowse.PRICE_FREE -> R.string.stores_itch_price_free ItchBrowse.PRICE_SALE -> R.string.stores_itch_price_sale + ItchBrowse.PRICE_PAID -> R.string.stores_itch_price_paid + ItchBrowse.PRICE_UNDER_5 -> R.string.stores_itch_price_under_5 + ItchBrowse.PRICE_UNDER_15 -> R.string.stores_itch_price_under_15 else -> R.string.stores_itch_price_any }, ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 3492498909..e183c155c5 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2089,7 +2089,11 @@ تعذر استخراج التنزيل (رمز الخروج %1$d) لم يستجب itch.io الأكثر شعبية - الجديد + الأحدث + جديد ورائج + مدفوع + 5 دولارات أو أقل + 15 دولارًا أو أقل الأعلى تقييمًا الأكثر مبيعًا أي سعر 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 e2aec713e2..6ecfbabd88 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2772,7 +2772,11 @@ No se pudo extraer la descarga (salida %1$d) itch.io no respondió Populares - Nuevos + Más recientes + Nuevos y populares + De pago + $5 o menos + $15 o menos Mejor valorados Más vendidos Cualquier precio diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 6dd5993d7d..f2f5d740d9 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2005,7 +2005,11 @@ Изтеглянето не можа да бъде разархивирано (код %1$d) itch.io не отговори Популярни - Нови + Най-нови + Нови и популярни + Платени + До $5 + До $15 Най-високо оценени Най-продавани Всякаква цена diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 44a0d027dd..595045bfe5 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2047,7 +2047,11 @@ Stažený soubor nelze rozbalit (kód %1$d) itch.io neodpovědělo Populární - Nové + Nejnovější + Nové a populární + Placené + Do $5 + Do $15 Nejlépe hodnocené Nejprodávanější Jakákoli cena diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index a3b601a3d7..6ae7e6ef0d 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2005,7 +2005,11 @@ Downloaden kunne ikke udpakkes (kode %1$d) itch.io svarede ikke Populære - Nye + Seneste + Nye og populære + Betalt + $5 eller mindre + $15 eller mindre Bedst bedømte Mest solgte Alle priser diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3b8c8162d7..37bbd2e361 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1997,7 +1997,11 @@ Download konnte nicht entpackt werden (Code %1$d) itch.io hat nicht geantwortet Beliebt - Neu + Neueste + Neu und beliebt + Kostenpflichtig + 5 $ oder weniger + 15 $ oder weniger Bestbewertet Meistverkauft Beliebiger Preis diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index ae4e0063dd..cfdd79e025 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2005,7 +2005,11 @@ Δεν ήταν δυνατή η αποσυμπίεση της λήψης (κωδικός %1$d) Το itch.io δεν απάντησε Δημοφιλή - Νέα + Πιο πρόσφατα + Νέα και δημοφιλή + Επί πληρωμή + $5 ή λιγότερο + $15 ή λιγότερο Κορυφαία βαθμολογία Μπεστ σέλερ Οποιαδήποτε τιμή diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index bc25285eab..b1d492c4be 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2028,7 +2028,11 @@ No se ha podido extraer la descarga (código %1$d) itch.io no respondió Populares - Novedades + Más recientes + Nuevos y populares + De pago + 5 $ o menos + 15 $ o menos Mejor valorados Más vendidos Cualquier precio diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 1555212462..3bcb194b94 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2005,7 +2005,11 @@ Latausta ei voitu purkaa (koodi %1$d) itch.io ei vastannut Suositut - Uudet + Uusimmat + Uudet ja suositut + Maksulliset + Enintään 5 $ + Enintään 15 $ Parhaiten arvioidut Myydyimmät Mikä tahansa hinta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5f4354c2ee..3d2e421738 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2028,7 +2028,11 @@ Impossible d\'extraire le téléchargement (code %1$d) itch.io n\'a pas répondu Populaires - Nouveautés + Plus récents + Nouveautés populaires + Payants + 5 $ ou moins + 15 $ ou moins Les mieux notés Meilleures ventes Tous les prix diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index e0dc7e02ce..3635c47b51 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2005,7 +2005,11 @@ डाउनलोड एक्सट्रैक्ट नहीं हो सका (कोड %1$d) itch.io ने जवाब नहीं दिया लोकप्रिय - नए + सबसे हाल के + नए और लोकप्रिय + सशुल्क + $5 या कम + $15 या कम सबसे ऊँची रेटिंग सबसे ज़्यादा बिकने वाले कोई भी कीमत diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 59c1587ffd..26681d702c 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2005,7 +2005,11 @@ A letöltés nem bontható ki (kód: %1$d) Az itch.io nem válaszolt Népszerű - Új + Legfrissebb + Új és népszerű + Fizetős + Legfeljebb 5 $ + Legfeljebb 15 $ Legjobbra értékelt Legkelendőbb Bármilyen ár diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 73e4d0758a..30d3ffddb4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1984,7 +1984,11 @@ Tidak dapat mengekstrak unduhan (kode %1$d) itch.io tidak menjawab Populer - Baru + Terbaru + Baru dan populer + Berbayar + $5 atau kurang + $15 atau kurang Rating tertinggi Terlaris Harga apa saja diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d7d25d20ea..e0f8dcff02 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2018,7 +2018,11 @@ Impossibile estrarre il download (codice %1$d) itch.io non ha risposto Popolari - Novità + Più recenti + Nuovi e popolari + A pagamento + 5 $ o meno + 15 $ o meno I più votati I più venduti Qualsiasi prezzo diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 4c71bac1bf..13b5330173 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1986,7 +1986,11 @@ ダウンロードを展開できませんでした (終了コード %1$d) itch.io から応答がありません 人気 - 新着 + 新着順 + 新着&人気 + 有料 + 5ドル以下 + 15ドル以下 高評価 売れ筋 すべての価格 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ef455c2632..082d66e92c 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1986,7 +1986,11 @@ 다운로드한 파일의 압축을 풀 수 없습니다(코드 %1$d) itch.io가 응답하지 않았습니다 인기 - 신규 + 최신순 + 신규 및 인기 + 유료 + $5 이하 + $15 이하 평점 높은 순 베스트셀러 모든 가격 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index f8ce63780e..542c2dd34f 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -1984,7 +1984,11 @@ Tidak dapat mengekstrak muat turun (kod %1$d) itch.io tidak menjawab Popular - Baharu + Terkini + Baharu dan popular + Berbayar + $5 atau kurang + $15 atau kurang Penilaian tertinggi Terlaris Sebarang harga diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 302f38673f..475da964da 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2005,7 +2005,11 @@ Kunne ikke pakke ut nedlastingen (kode %1$d) itch.io svarte ikke Populære - Nye + Nyeste + Nye og populære + Betalt + $5 eller mindre + $15 eller mindre Best vurdert Mest solgt Alle priser diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1b294f91a1..abef2e0e7b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2005,7 +2005,11 @@ Download kan niet worden uitgepakt (code %1$d) itch.io gaf geen antwoord Populair - Nieuw + Meest recent + Nieuw en populair + Betaald + $5 of minder + $15 of minder Hoogst beoordeeld Bestverkocht Elke prijs diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8b1057f1dc..13c4442d11 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2047,7 +2047,11 @@ Nie można rozpakować pobranego pliku (kod %1$d) itch.io nie odpowiedziało Popularne - Nowe + Najnowsze + Nowe i popularne + Płatne + Do 5 $ + Do 15 $ Najwyżej oceniane Najlepiej sprzedające się Dowolna cena diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index d6cacfcb65..7cb4db950c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2018,7 +2018,11 @@ Não foi possível extrair a transferência (código %1$d) O itch.io não respondeu Populares - Novos + Mais recentes + Novos e populares + Pagos + 5 $ ou menos + 15 $ ou menos Mais bem avaliados Mais vendidos Qualquer preço diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 6db4712e69..69ff257a76 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2018,7 +2018,11 @@ Não foi possível extrair o download (código %1$d) O itch.io não respondeu Populares - Novos + Mais recentes + Novos e populares + Pagos + US$ 5 ou menos + US$ 15 ou menos Mais bem avaliados Mais vendidos Qualquer preço diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 6a818b9060..0e3af22a0f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2026,7 +2026,11 @@ Descărcarea nu a putut fi extrasă (cod %1$d) itch.io nu a răspuns Populare - Noi + Cele mai recente + Noi și populare + Cu plată + 5 $ sau mai puțin + 15 $ sau mai puțin Cele mai bine cotate Cele mai vândute Orice preț diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index baedc0addc..45bd91d497 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2049,7 +2049,11 @@ Не удалось распаковать загрузку (код %1$d) itch.io не ответил Популярные - Новые + Самые новые + Новые и популярные + Платные + До $5 + До $15 С лучшими оценками Бестселлеры Любая цена diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 40e8f30019..845f2e1156 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2005,7 +2005,11 @@ Det gick inte att packa upp nedladdningen (kod %1$d) itch.io svarade inte Populära - Nya + Senaste + Nya och populära + Betalda + $5 eller mindre + $15 eller mindre Högst betyg Mest sålda Alla priser diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 0bbbc29f94..abef80667f 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1984,7 +1984,11 @@ แตกไฟล์ที่ดาวน์โหลดไม่ได้ (รหัส %1$d) itch.io ไม่ตอบสนอง ยอดนิยม - ใหม่ + ล่าสุด + ใหม่และยอดนิยม + เสียเงิน + ไม่เกิน $5 + ไม่เกิน $15 คะแนนสูงสุด ขายดี ทุกราคา diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1cee39be2e..a6b779155e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1999,7 +1999,11 @@ İndirme ayıklanamadı (kod %1$d) itch.io yanıt vermedi Popüler - Yeni + En yeniler + Yeni ve popüler + Ücretli + $5 veya altı + $15 veya altı En yüksek puanlı En çok satanlar Herhangi bir fiyat diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2bb20ce206..b2afcec56f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2047,7 +2047,11 @@ Не вдалося розпакувати завантаження (код %1$d) itch.io не відповів Популярні - Нові + Найновіші + Нові й популярні + Платні + До $5 + До $15 З найвищими оцінками Бестселери Будь-яка ціна diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 44cec9e4d6..d0f0f0f838 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1984,7 +1984,11 @@ Không thể giải nén bản tải xuống (mã %1$d) itch.io không phản hồi Phổ biến - Mới + Mới nhất + Mới và phổ biến + Trả phí + Từ $5 trở xuống + Từ $15 trở xuống Đánh giá cao nhất Bán chạy nhất Mọi mức giá diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3e526c9bdc..b3f20f0a3b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2063,7 +2063,11 @@ 无法解压下载内容(代码 %1$d) itch.io 没有响应 热门 - 最新 + 最新发布 + 新品与热门 + 付费 + 5 美元以下 + 15 美元以下 评分最高 热销 任意价格 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 9762b520fd..dd8fce4d8a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1987,7 +1987,11 @@ 無法解壓下載內容(代碼 %1$d) itch.io 沒有回應 熱門 - 最新 + 最新發布 + 新品與熱門 + 付費 + 5 美元以下 + 15 美元以下 評分最高 熱賣 任何價格 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c5535bea76..186da38ef7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1987,7 +1987,11 @@ 無法解壓縮下載內容(代碼 %1$d) itch.io 沒有回應 熱門 - 最新 + 最新發布 + 新品與熱門 + 付費 + 5 美元以下 + 15 美元以下 評分最高 熱銷 任何價格 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3c6a8f85d0..67e247971e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2082,7 +2082,11 @@ Could not extract the download (exit %1$d) itch.io did not answer Popular - New + Most recent + New & popular + Paid + $5 or less + $15 or less Top rated Top sellers Any price diff --git a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt index c8df0bbbe6..8ee4f83346 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/itch/ItchBrowseTest.kt @@ -5,50 +5,61 @@ import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test +/** Every address here was copied from itch.io's own links, not worked out. */ class ItchBrowseTest { + private fun path(sort: String = ItchBrowse.SORT_POPULAR, price: String = ItchBrowse.PRICE_ANY, platforms: Set = emptySet(), tags: List = emptyList()) = + ItchBrowse.path(BrowseQuery(sort, price, platforms, tags)) + @Test fun theDefaultQueryIsTheFrontPage() { assertTrue(BrowseQuery().isDefault) - assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEW).isDefault) + assertFalse(BrowseQuery(sort = ItchBrowse.SORT_NEWEST).isDefault) assertFalse(BrowseQuery(price = ItchBrowse.PRICE_FREE).isDefault) } - @Test fun sortsMapToTheirFeedPaths() { - assertEquals(listOf("https://itch.io/games.xml"), ItchBrowse.urls(BrowseQuery(), 1)) - assertEquals(listOf("https://itch.io/games/newest.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 1)) - assertEquals(listOf("https://itch.io/games/top-rated.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED), 1)) - assertEquals(listOf("https://itch.io/games/top-sellers.xml"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_SELLERS), 1)) + @Test fun sortsUseItchsOwnPaths() { + assertEquals("https://itch.io/games", path()) + assertEquals("https://itch.io/games/new-and-popular", path(sort = ItchBrowse.SORT_NEW_POPULAR)) + assertEquals("https://itch.io/games/top-sellers", path(sort = ItchBrowse.SORT_TOP_SELLERS)) + assertEquals("https://itch.io/games/top-rated", path(sort = ItchBrowse.SORT_TOP_RATED)) + assertEquals("https://itch.io/games/newest", path(sort = ItchBrowse.SORT_NEWEST)) } - @Test fun pagesAfterTheFirstCarryThePageNumber() { - assertEquals(listOf("https://itch.io/games/newest.xml?page=3"), ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_NEW), 3)) + @Test fun pricesUseItchsOwnPaths() { + assertEquals("https://itch.io/games/free", path(price = ItchBrowse.PRICE_FREE)) + assertEquals("https://itch.io/games/on-sale", path(price = ItchBrowse.PRICE_SALE)) + assertEquals("https://itch.io/games/store", path(price = ItchBrowse.PRICE_PAID)) + assertEquals("https://itch.io/games/5-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_5)) + assertEquals("https://itch.io/games/15-dollars-or-less", path(price = ItchBrowse.PRICE_UNDER_15)) } - @Test fun aPriceFilterOffersEverySpellingInOrder() { - val free = ItchBrowse.urls(BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED, price = ItchBrowse.PRICE_FREE), 1) - assertEquals(listOf("https://itch.io/games/top-rated/free.xml", "https://itch.io/games/top-rated/price-free.xml"), free) - assertEquals(listOf("https://itch.io/games/on-sale.xml"), ItchBrowse.urls(BrowseQuery(price = ItchBrowse.PRICE_SALE), 1)) - } - - @Test fun platformsAndTagsFollowTheSortAndPriceInAFixedOrder() { - val query = BrowseQuery( - sort = ItchBrowse.SORT_NEW, price = ItchBrowse.PRICE_SALE, - platforms = setOf("web", "linux"), tags = listOf("Pixel Art", "Horror"), + @Test fun platformsUseItchsOwnNames() { + val expected = mapOf( + "windows" to "platform-windows", "osx" to "platform-osx", "linux" to "platform-linux", "android" to "platform-android", + "ios" to "platform-ios", "web" to "platform-web", "mobile-web" to "platform-mobile-web", ) + assertEquals(expected.keys.toList(), ItchBrowse.platformNames) + for ((name, segment) in expected) assertEquals("https://itch.io/games/$segment", path(platforms = setOf(name))) + } + + @Test fun aSortAPriceAndAPlatformCombineInThatOrder() { assertEquals( - listOf("https://itch.io/games/newest/on-sale/platform-linux/platform-web/tag-pixel-art/tag-horror.xml"), - ItchBrowse.urls(query, 1), + "https://itch.io/games/top-rated/free/platform-windows", + path(ItchBrowse.SORT_TOP_RATED, ItchBrowse.PRICE_FREE, setOf("windows")), ) } - @Test fun tagsBecomeSlugs() { + @Test fun aTagIsItsLowercaseNameWithHyphens() { + assertEquals("https://itch.io/games/tag-pixel-art", path(tags = listOf("Pixel Art"))) assertEquals("pixel-art", ItchBrowse.tagSlug(" Pixel Art ")) - assertEquals("2d", ItchBrowse.tagSlug("2D")) - assertEquals("sci-fi", ItchBrowse.tagSlug("Sci-Fi!")) } - @Test fun theSamePlatformsInAnyOrderGiveTheSameUrl() { - val a = ItchBrowse.urls(BrowseQuery(platforms = setOf("web", "linux")), 1) - val b = ItchBrowse.urls(BrowseQuery(platforms = setOf("linux", "web")), 1) - assertEquals(a, b) + @Test fun theSamePlatformsInAnyOrderGiveTheSameAddress() { + assertEquals(path(platforms = setOf("web", "linux")), path(platforms = setOf("linux", "web"))) + } + + @Test fun laterPagesAskForThePageNumberAndTheFirstDoesNot() { + val query = BrowseQuery(sort = ItchBrowse.SORT_TOP_RATED) + assertEquals("https://itch.io/games/top-rated.xml", ItchBrowse.url(query, 1)) + assertEquals("https://itch.io/games/top-rated.xml?page=2", ItchBrowse.url(query, 2)) } } diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md index de5929afcf..78c056300b 100644 --- a/docs/development/itch-browse.md +++ b/docs/development/itch-browse.md @@ -14,10 +14,12 @@ https://itch.io/games[/][/][/platform-...][/tag-...].xm ``` `BrowseQuery` already carries platforms and tags, so the URL builder is complete; the controls for them -come in a later change. A price filter has more than one spelling on itch, so `urls()` returns every -candidate and `page()` takes the first that answers with games. Every request is logged -(`itch.io browse: answered with games`), which is how a wrong guess is found and fixed -from a device. +come in a later change. The path pieces are itch's own, copied from its links: sorts `new-and-popular`, `top-sellers`, `top-rated`, +`newest` (Popular has none); prices `free`, `on-sale`, `store` (Paid), `5-dollars-or-less`, +`15-dollars-or-less`; platforms `platform-windows`, `-osx`, `-linux`, `-android`, `-ios`, `-web`, +`-mobile-web`; a tag is `tag-` and its lowercase name with hyphens. `ItchBrowse.path()` builds the page +address, `url()` adds `.xml` and `?page=N`. Every request is logged +(`itch.io browse: answered with games`). Requests go out one at a time, at least 1.2 s apart. A 429 waits 8 s and tries once more; if that fails the games already on screen stay. Each page is kept under the app cache for three hours, so going back to