mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-19 12:56:06 +00:00
Ubisoft: show art for owned games the profile list leaves out (#2865)
Games Connect owns but the GraphQL game list does not name were added with no image. Take their art from the product configuration's background_image and thumb_image, following localisation keys, from Ubisoft's launcher asset CDN.
This commit is contained in:
1 parent
adf13d0bdd
commit
f180d98da7
2 files changed
+45
-4
No files matched your search
@@ -168,14 +168,14 @@ object UbisoftLibrary {
|
||||
internal fun assemble(listed: List<CatalogItem>, owned: JSONObject?): List<CatalogItem> {
|
||||
val known = owned?.optJSONArray("games") != null && owned.optString("error").isEmpty()
|
||||
val bySpace = ownedBySpace(owned)
|
||||
val matched = listed.map { g -> bySpace[g.id]?.let { g.copy(extra = g.extra + download(it)) } ?: g }
|
||||
val matched = listed.map { g -> bySpace[g.id]?.let { withArt(g.copy(extra = g.extra + download(it)), it) } ?: g }
|
||||
.filter { !known || it.extra["productId"] != null }
|
||||
.let { games -> games.filter { g -> g.extra["productId"] == null || games.first { it.extra["productId"] == g.extra["productId"] } === g } }
|
||||
.let { games -> games.filter { g -> g.extra["productId"] != null || games.none { it !== g && it.title == g.title && it.extra["productId"] != null } } }
|
||||
val products = matched.mapNotNull { it.extra["productId"] }.toSet()
|
||||
val unlisted = bySpace.filterKeys { space -> listed.none { it.id == space } }.filterValues { it.optLong("productId").toString() !in products }.mapNotNull { (space, o) ->
|
||||
val title = title(o.optString("configuration")) ?: return@mapNotNull null
|
||||
CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o))
|
||||
withArt(CatalogItem(Store.UBISOFT, space, title, null, owned = true, extra = mapOf("spaceId" to space) + download(o)), o)
|
||||
}
|
||||
return (matched + unlisted).sortedBy { it.title.lowercase() }
|
||||
}
|
||||
@@ -184,12 +184,36 @@ object UbisoftLibrary {
|
||||
|
||||
private val NAME = Regex("""^\s{1,4}name:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE)
|
||||
|
||||
/** The default text of a localisation key such as `l1` or `THUMBIMAGE`. */
|
||||
private fun localized(configuration: String, key: String): String? {
|
||||
if (!Regex("""\w+""").matches(key)) return null
|
||||
val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return null
|
||||
return Regex("""^\s+${key}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim()
|
||||
}
|
||||
|
||||
/** The product's name from its configuration, following a localisation key such as `l1` to its default text. */
|
||||
internal fun title(configuration: String): String? {
|
||||
val raw = NAME.find(configuration)?.groupValues?.get(1)?.trim()?.takeIf { it.isNotEmpty() } ?: return null
|
||||
if (!Regex("""l\d+""").matches(raw)) return raw
|
||||
val local = configuration.indexOf("localizations:").takeIf { it >= 0 } ?: return raw
|
||||
return Regex("""^\s+${raw}:\s*['"]?(.+?)['"]?\s*$""", RegexOption.MULTILINE).find(configuration, local)?.groupValues?.get(1)?.trim() ?: raw
|
||||
return localized(configuration, raw) ?: raw
|
||||
}
|
||||
|
||||
private const val ASSETS = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/"
|
||||
private val ASSET = Regex("""[\w.-]+\.(?:jpe?g|png)""", RegexOption.IGNORE_CASE)
|
||||
|
||||
/** The URL of an image the configuration's `root` names, such as `thumb_image`, following a localisation key to its file. */
|
||||
internal fun image(configuration: String, key: String): String? {
|
||||
val raw = Regex("""^ {1,2}${key}:[ \t]*['"]?([^'"\r\n]+?)['"]?[ \t]*$""", RegexOption.MULTILINE).find(configuration)?.groupValues?.get(1)?.trim() ?: return null
|
||||
val file = raw.takeIf { ASSET.matches(it) } ?: localized(configuration, raw)?.takeIf { ASSET.matches(it) } ?: return null
|
||||
return ASSETS + file
|
||||
}
|
||||
|
||||
/** Art the profile's game list lacks, from the product's configuration: games Connect owns but the list leaves out have none. */
|
||||
private fun withArt(g: CatalogItem, owned: JSONObject): CatalogItem {
|
||||
if (g.imageUrl != null && g.tallImageUrl != null) return g
|
||||
val configuration = owned.optString("configuration")
|
||||
val thumb = image(configuration, "thumb_image")
|
||||
return g.copy(imageUrl = g.imageUrl ?: image(configuration, "background_image") ?: thumb, tallImageUrl = g.tallImageUrl ?: thumb)
|
||||
}
|
||||
|
||||
/** The first launch path under `start_game` in a product's configuration. */
|
||||
|
||||
@@ -40,6 +40,23 @@ class UbisoftTest {
|
||||
assertEquals("Steam", UbisoftLibrary.thirdParty(steamConfig))
|
||||
}
|
||||
|
||||
@Test fun gamesTheProfileLeavesOutTakeTheirArtFromTheConfiguration() {
|
||||
val config = "version: 2.0\r\nroot:\r\n name: l1\r\n thumb_image: THUMBIMAGE\r\n background_image: 'b4c1.jpg'\r\n" +
|
||||
" installer:\r\n thumb_image: nested.jpg\r\nlocalizations:\r\n default:\r\n l1: \"Assassin's Creed\u2122\"\r\n THUMBIMAGE: a3a6.jpg\r\n"
|
||||
val owned = JSONObject().put("games", JSONArray()
|
||||
.put(JSONObject().put("productId", 109).put("spaceId", "space-sc").put("productType", 0).put("owned", true).put("manifest", "AB").put("configuration", config))
|
||||
.put(JSONObject().put("productId", 82).put("spaceId", "space-ac").put("productType", 0).put("owned", true).put("manifest", "CD").put("configuration", config)))
|
||||
val art = CatalogItem(Store.UBISOFT, "space-sc", "Splinter Cell", "https://x/wide.jpg", tallImageUrl = "https://x/tall.jpg", owned = true, extra = mapOf("spaceId" to "space-sc"))
|
||||
val games = UbisoftLibrary.assemble(listOf(art), owned)
|
||||
val assets = "https://static3.cdn.ubi.com/orbit/uplay_launcher_3_0/assets/"
|
||||
val unlisted = games.first { it.id == "space-ac" }
|
||||
assertEquals("Assassin's Creed\u2122", unlisted.title)
|
||||
assertEquals(assets + "b4c1.jpg", unlisted.imageUrl)
|
||||
assertEquals(assets + "a3a6.jpg", unlisted.tallImageUrl)
|
||||
assertEquals("https://x/wide.jpg", games.first { it.id == "space-sc" }.imageUrl)
|
||||
assertNull(UbisoftLibrary.image("root:\n thumb_image: THUMBIMAGE\n", "thumb_image"))
|
||||
}
|
||||
|
||||
@Test fun withoutAnOwnershipAnswerTheProfileListStays() {
|
||||
val profile = listOf(listed("space-sc", "Splinter Cell"), listed("space-gone", "Free Weekend"))
|
||||
assertEquals(listOf("space-gone", "space-sc"), UbisoftLibrary.assemble(profile, JSONObject().put("error", "demux closed")).map { it.id })
|
||||
|
||||
Reference in new issue
Block a user