diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt index 394164c4c3..fb9c5c8ab4 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicBackend.kt @@ -84,6 +84,11 @@ object EpicBackend : StoreBackend, EpicLaunchSupport { Store.EPIC, item.id, item.title, cover = item.imageUrl, bytesTotal = item.sizeBytes, location = StoreInstallRoot.labelFor(app, folder), ) + val launcher = item.extra["thirdPartyManagedApp"].orEmpty() + if (launcher.isNotBlank()) { + DownloadQueue.recordFailed(app, entry, app.getString(R.string.epic_third_party_managed, launcher)) + return + } DownloadQueue.enqueue(app, entry) { EpicInstaller(app, item, folder) } } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicLibrary.kt b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicLibrary.kt index 32a485bfba..f9ae36b192 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicLibrary.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/epic/EpicLibrary.kt @@ -26,6 +26,7 @@ data class EpicGame( val publisher: String = "", val isDlc: Boolean = false, val artLogo: String = "", + val thirdPartyManagedApp: String = "", ) object EpicLibrary { @@ -52,7 +53,10 @@ object EpicLibrary { .put("developer", g.developer).put("description", g.description).put("version", g.version) .put("installSize", g.installSize).put("canRunOffline", g.canRunOffline) .put("releaseDate", g.releaseDate).put("publisher", g.publisher) - .apply { if (g.artLogo.isNotEmpty()) put("artLogo", g.artLogo) }, + .apply { + if (g.artLogo.isNotEmpty()) put("artLogo", g.artLogo) + if (g.thirdPartyManagedApp.isNotEmpty()) put("thirdPartyManagedApp", g.thirdPartyManagedApp) + }, ) }.toString() @@ -76,6 +80,7 @@ object EpicLibrary { releaseDate = o.optString("releaseDate", ""), publisher = o.optString("publisher", ""), artLogo = o.optString("artLogo", ""), + thirdPartyManagedApp = o.optString("thirdPartyManagedApp", ""), ) } return tidy(games) @@ -108,7 +113,12 @@ object EpicLibrary { owned = true, sizeBytes = prefs.getLong("size_${game.appName}", 0L).takeIf { it > 0 } ?: game.installSize, storeUrl = "https://store.epicgames.com/en-US/browse?q=" + URLEncoder.encode(title, "UTF-8"), - extra = mapOf("namespace" to game.namespace, "catalogItemId" to game.catalogItemId, "version" to game.version), + extra = mapOf( + "namespace" to game.namespace, + "catalogItemId" to game.catalogItemId, + "version" to game.version, + "thirdPartyManagedApp" to game.thirdPartyManagedApp, + ), logoUrl = game.artLogo.ifEmpty { null }, ) } @@ -133,6 +143,7 @@ object EpicLibrary { publisher = pick("publisher", before?.publisher.orEmpty()), isDlc = d.optBoolean("dlc", false), artLogo = pick("logo", before?.artLogo.orEmpty()), + thirdPartyManagedApp = details?.optString("thirdPartyManagedApp", "") ?: before?.thirdPartyManagedApp.orEmpty(), ) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5f242431c5..0efb6a3d98 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4159,6 +4159,7 @@ إعادة تعيين المواضع إظهار التسمية تعذّر استيراد هذا التخطيط + يُثبّت عبر %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 eaa383dff7..c5277a46cd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4012,6 +4012,7 @@ Restablecer posiciones Mostrar etiqueta No se pudo importar esta disposición + Se instala mediante %1$s Nieve escarlata Superficies blancas con acentos rojos. Bandas sonoras diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index b7b889739e..21c12beb44 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3999,6 +3999,7 @@ Нулиране на позициите Показване на етикета Това разположение не можа да бъде импортирано + Инсталира се чрез %1$s Ален сняг Бели повърхности с червени акценти. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index ef898c549a..d31c8ccfad 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4079,6 +4079,7 @@ Obnovit pozice Zobrazit popisek Toto rozložení nelze importovat + Instaluje se přes %1$s Šarlatový sníh Bílé povrchy s červenými akcenty. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b331e0ddda..49f73e8841 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3999,6 +3999,7 @@ Nulstil placeringer Vis etiket Dette layout kunne ikke importeres + Installeres via %1$s Skarlagensne Hvide overflader med røde accenter. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ba918b65f6..ce94b712c6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3999,6 +3999,7 @@ Positionen zurücksetzen Beschriftung anzeigen Dieses Layout konnte nicht importiert werden + Wird über %1$s installiert Scharlachroter Schnee Weiße Oberflächen mit roten Akzenten. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 406bef90ae..7189d25ce6 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3999,6 +3999,7 @@ Επαναφορά θέσεων Εμφάνιση ετικέτας Δεν ήταν δυνατή η εισαγωγή αυτής της διάταξης + Εγκαθίσταται μέσω %1$s Κατακόκκινο χιόνι Λευκές επιφάνειες με κόκκινες λεπτομέρειες. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 2d1824196c..9c12d314e8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4039,6 +4039,7 @@ Restablecer posiciones Mostrar etiqueta No se ha podido importar esta disposición + Se instala mediante %1$s Nieve escarlata Superficies blancas con acentos rojos. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 46f0b78781..d3c9c2a6a7 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3999,6 +3999,7 @@ Palauta sijainnit Näytä nimi Tätä asettelua ei voitu tuoda + Asennetaan sovelluksen %1$s kautta Helakanpunainen lumi Valkoiset pinnat punaisin korostuksin. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 993c9c8a16..fd2a751806 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4038,6 +4038,7 @@ Réinitialiser les positions Afficher le libellé Impossible d’importer cette disposition + S’installe via %1$s Neige écarlate Surfaces blanches avec des accents rouges. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 454495d79b..ab18cf97f7 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3999,6 +3999,7 @@ स्थितियाँ रीसेट करें लेबल दिखाएँ यह लेआउट इम्पोर्ट नहीं किया जा सका + %1$s के ज़रिए इंस्टॉल होता है किरमिज़ी बर्फ लाल रंग की झलकियों वाली सफ़ेद सतहें। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 21eeafeab6..4dc1f7ab25 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3999,6 +3999,7 @@ Pozíciók visszaállítása Címke megjelenítése Ez az elrendezés nem importálható + A telepítés itt történik: %1$s Skarlátvörös hó Fehér felületek piros kiemelésekkel. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 46381a0361..193ee742f7 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3969,6 +3969,7 @@ Atur ulang posisi Tampilkan label Tata letak ini tidak dapat diimpor + Diinstal melalui %1$s Salju Kirmizi Permukaan putih dengan aksen merah. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 0b1cc00fb0..5bd4191615 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4038,6 +4038,7 @@ Ripristina posizioni Mostra etichetta Impossibile importare questo layout + Si installa tramite %1$s Neve scarlatta Superfici bianche con accenti rossi. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 8012204e20..188a1f3afd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3969,6 +3969,7 @@ 位置をリセット ラベルを表示 このレイアウトをインポートできませんでした + %1$s からインストールします 緋色の雪 白いサーフェスに赤のアクセント。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9948828682..388b0fbf9b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3969,6 +3969,7 @@ 위치 초기화 라벨 표시 이 레이아웃을 가져올 수 없습니다 + %1$s을(를) 통해 설치합니다 진홍빛 눈 빨간색 포인트가 있는 흰색 표면. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 4eacf7d480..0539110e2a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3969,6 +3969,7 @@ Tetapkan semula kedudukan Tunjukkan label Susun atur ini tidak dapat diimport + Dipasang melalui %1$s Salji Merah Skarlet Permukaan putih dengan aksen merah. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4836c4e2a4..186b730e79 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3999,6 +3999,7 @@ Tilbakestill plasseringer Vis etikett Kunne ikke importere dette oppsettet + Installeres via %1$s Skarlagenssnø Hvite flater med røde aksenter. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9061c61d51..32d84c5b0d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3999,6 +3999,7 @@ Posities herstellen Label tonen Deze indeling kan niet worden geïmporteerd + Wordt geïnstalleerd via %1$s Scharlakenrode sneeuw Witte oppervlakken met rode accenten. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b8e171bfe9..f0aad30bf5 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4079,6 +4079,7 @@ Resetuj położenie Pokaż etykietę Nie można zaimportować tego układu + Instalacja przez %1$s Szkarłatny śnieg Białe powierzchnie z czerwonymi akcentami. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 26d665abe5..25b5b3a69b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -4038,6 +4038,7 @@ Repor posições Mostrar etiqueta Não foi possível importar este esquema + Instala-se através de %1$s Neve Escarlate Superfícies brancas com detalhes vermelhos. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index db90e852fe..5a7942708f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -4046,6 +4046,7 @@ Redefinir posições Mostrar rótulo Não foi possível importar este layout + Instala-se através de %1$s Neve Escarlate Superfícies brancas com detalhes em vermelho. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 30de20027b..1c84500c16 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4039,6 +4039,7 @@ Resetează pozițiile Afișează eticheta Acest aranjament nu a putut fi importat + Se instalează prin %1$s Zăpadă stacojie Suprafețe albe cu accente roșii. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b1c9f1fd40..73ff1ab7d7 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4079,6 +4079,7 @@ Сбросить положение Показывать подпись Не удалось импортировать эту раскладку + Устанавливается через %1$s Алый снег Белые поверхности с красными акцентами. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 46929f6d28..0459e70db0 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3999,6 +3999,7 @@ Återställ positioner Visa etikett Det gick inte att importera layouten + Installeras via %1$s Scharlakansröd snö Vita ytor med röda accenter. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 193ac70dca..b27791fe29 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3969,6 +3969,7 @@ รีเซ็ตตำแหน่ง แสดงป้ายกำกับ ไม่สามารถนำเข้าการจัดวางนี้ได้ + ติดตั้งผ่าน %1$s หิมะสีแดงชาด พื้นผิวสีขาวมีสีแดงเป็นสีเน้น diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8c77c78108..3af54ba1eb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3999,6 +3999,7 @@ Konumları sıfırla Etiketi göster Bu düzen içe aktarılamadı + %1$s üzerinden yüklenir Kızıl Kar Kırmızı vurgulu beyaz yüzeyler. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b1520255cb..a05c56f0a9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4079,6 +4079,7 @@ Скинути розташування Показувати підпис Не вдалося імпортувати цю розкладку + Встановлюється через %1$s Багряний сніг Білі поверхні з червоними акцентами. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index be35e05cc9..b1ea497c9f 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3969,6 +3969,7 @@ Đặt lại vị trí Hiện nhãn Không thể nhập bố cục này + Cài đặt qua %1$s Tuyết đỏ thẫm Bề mặt trắng với điểm nhấn màu đỏ. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5cd73bbb81..1840a4706d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3969,6 +3969,7 @@ 重置位置 显示标签 无法导入此布局 + 通过 %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 36934e918a..c902f1629c 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3969,6 +3969,7 @@ 重設位置 顯示標籤 無法匯入此佈局 + 透過 %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 74f5101319..e23fe7fda9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3969,6 +3969,7 @@ 重設位置 顯示標籤 無法匯入此版面配置 + 透過 %1$s 安裝 緋紅之雪 白色表面搭配紅色點綴。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 57ea45a404..d478a96a89 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4077,6 +4077,7 @@ Reset positions Show label Could not import this layout + Installs through %1$s Scarlet Snow White surfaces with red accents. diff --git a/app/src/main/rust/stores/src/epic/catalog.rs b/app/src/main/rust/stores/src/epic/catalog.rs index 420d656e80..ef3d585de0 100644 --- a/app/src/main/rust/stores/src/epic/catalog.rs +++ b/app/src/main/rust/stores/src/epic/catalog.rs @@ -51,6 +51,20 @@ fn attribute_of(entry: &Value, name: &str) -> Option { .map(str::to_string) } +fn third_party_managed_app(entry: &Value) -> Option { + let value = attribute_of(entry, "ThirdPartyManagedApp")?; + let value = value.trim(); + if value.is_empty() { + return None; + } + let launcher = match value.to_ascii_lowercase().as_str() { + "origin" | "ea app" | "the ea app" => "EA app", + "ubisoft connect" | "uplay" => "Ubisoft Connect", + _ => value, + }; + Some(launcher.to_string()) +} + pub fn details_of(entry: &Value) -> Value { let publisher = attribute_of(entry, "publisherName") .map(|p| p.trim().to_string()) @@ -73,6 +87,7 @@ pub fn details_of(entry: &Value) -> Value { "wide": image(entry, &["DieselGameBox", "Thumbnail"]), "logo": image(entry, &["DieselGameBoxLogo"]), "canRunOffline": offline, + "thirdPartyManagedApp": third_party_managed_app(entry).unwrap_or_default(), "dlc": main_game.is_some_and(|m| !m.is_null()), "mainGameId": main_game.map(|m| net::str_of(m, "id")).unwrap_or(""), }) @@ -118,6 +133,7 @@ mod tests { assert_eq!(d["logo"], "logo"); assert_eq!(d["publisher"], "Pub"); assert_eq!(d["canRunOffline"], false); + assert_eq!(d["thirdPartyManagedApp"], ""); assert_eq!(d["releaseDate"], "2020-01-01T00:00:00.000Z"); assert_eq!(d["dlc"], false); let dlc = details_of(&json!({"mainGameItem": {"id": "base"}, "seller": {"name": "S"}, "viewableDate": "v"})); @@ -129,4 +145,14 @@ mod tests { assert_eq!(dlc["logo"], ""); assert_eq!(pick_entry(&json!({"x": {"title": "Only"}}), "y").unwrap()["title"], "Only"); } + + #[test] + fn parses_third_party_managed_launchers() { + let ea = details_of(&json!({"customAttributes": {"ThirdPartyManagedApp": {"value": "Origin"}}})); + let ubisoft = details_of(&json!({"customAttributes": {"ThirdPartyManagedApp": {"value": "Ubisoft Connect"}}})); + let none = details_of(&json!({})); + assert_eq!(ea["thirdPartyManagedApp"], "EA app"); + assert_eq!(ubisoft["thirdPartyManagedApp"], "Ubisoft Connect"); + assert_eq!(none["thirdPartyManagedApp"], ""); + } } diff --git a/app/src/main/rust/stores/src/epic/install/mod.rs b/app/src/main/rust/stores/src/epic/install/mod.rs index df20412aca..8cca149c4e 100644 --- a/app/src/main/rust/stores/src/epic/install/mod.rs +++ b/app/src/main/rust/stores/src/epic/install/mod.rs @@ -50,6 +50,9 @@ pub struct Request { impl Request { pub fn from_json(v: &Value) -> Result { + if let Some(launcher) = v.get("thirdPartyManagedApp").and_then(Value::as_str).map(str::trim).filter(|s| !s.is_empty()) { + return Err(format!("third-party-managed:{launcher}")); + } let info = v.get("info").and_then(BuildInfo::from_json).ok_or("The manifest could not be fetched")?; let game_dir = net::str_of(v, "gameDir"); if game_dir.is_empty() || !game_dir.starts_with('/') { diff --git a/app/src/main/rust/stores/src/epic/install/tests.rs b/app/src/main/rust/stores/src/epic/install/tests.rs index 127d772de7..1f8479f9be 100644 --- a/app/src/main/rust/stores/src/epic/install/tests.rs +++ b/app/src/main/rust/stores/src/epic/install/tests.rs @@ -12,6 +12,15 @@ use crate::epic::chunk::testing::encode; use crate::epic::manifest::testing::{build, chunk, TestFile, TestManifest}; use crate::epic::manifest::{guid_text, PartRef}; +#[test] +fn rejects_third_party_managed_install_before_manifest_parsing() { + let request = serde_json::json!({"thirdPartyManagedApp": "EA app"}); + match Request::from_json(&request) { + Err(error) => assert_eq!(error, "third-party-managed:EA app"), + Ok(_) => panic!("third-party-managed install was accepted"), + } +} + fn serve(files: HashMap>, hits: Arc) -> String { let listener = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = listener.local_addr().unwrap(); diff --git a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt index a3f156e1b0..96876bf5b1 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/epic/EpicLibraryTest.kt @@ -30,6 +30,29 @@ class EpicLibraryTest { assertEquals(listOf(game), EpicLibrary.fromCacheJson(text)) } + @Test fun thirdPartyLauncherIsCarriedToCatalogItems() { + val game = EpicLibrary.gameFrom( + JSONObject().put("appName", "Fig").put("namespace", "ns").put("catalogItemId", "cat"), + JSONObject().put("thirdPartyManagedApp", "EA app"), + null, + ) + assertEquals("EA app", game.thirdPartyManagedApp) + assertEquals("EA app", EpicLibrary.toCatalogItem(app, game).extra["thirdPartyManagedApp"]) + } + + @Test fun catalogDetailsClearTheCachedThirdPartyLauncher() { + val record = JSONObject().put("appName", "Fig").put("namespace", "ns").put("catalogItemId", "cat") + val before = EpicGame("Fig", "ns", "cat", "Fig", thirdPartyManagedApp = "EA app") + val fresh = EpicLibrary.gameFrom(record, JSONObject().put("thirdPartyManagedApp", ""), before) + assertEquals("", fresh.thirdPartyManagedApp) + assertEquals("", EpicLibrary.toCatalogItem(app, fresh).extra["thirdPartyManagedApp"]) + assertEquals(listOf(fresh), EpicLibrary.fromCacheJson(EpicLibrary.toCacheJson(listOf(fresh)))) + assertEquals("", EpicLibrary.gameFrom(record, JSONObject(), before).thirdPartyManagedApp) + assertEquals("Ubisoft Connect", EpicLibrary.gameFrom(record, + JSONObject().put("thirdPartyManagedApp", "Ubisoft Connect"), before).thirdPartyManagedApp) + assertEquals("EA app", EpicLibrary.gameFrom(record, null, before).thirdPartyManagedApp) + } + @Test fun readingSkipsDedupsSortsAndCapsSizes() { val text = JSONArray() .put(JSONObject().put("appName", "b").put("title", "beta").put("installSize", (1L shl 41))) @@ -55,7 +78,7 @@ class EpicLibraryTest { assertEquals("Hi", item.description) assertTrue(item.owned) assertEquals("https://store.epicgames.com/en-US/browse?q=Fig+%26+Co", item.storeUrl) - assertEquals(mapOf("namespace" to "ns", "catalogItemId" to "cat", "version" to ""), item.extra) + assertEquals(mapOf("namespace" to "ns", "catalogItemId" to "cat", "version" to "", "thirdPartyManagedApp" to ""), item.extra) val old = EpicLibrary.toCatalogItem(app, EpicGame("Old", "ns", "c", "Old", artSquare = "wide", installSize = 9L)) assertEquals("2001", old.releaseDate) assertEquals(9L, old.sizeBytes)