mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 12:28:40 +00:00
fix(epic): say which launcher installs a third-party-managed game (#2344)
* fix(epic): handle third-party managed titles * Clear a cached third-party launcher when catalog details report none
This commit is contained in:
1 parent
448d296a2b
commit
fbb705cf6f
39 files changed
+113
-3
No files matched your search
@@ -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) }
|
||||
}
|
||||
|
||||
|
||||
@@ -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(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
@@ -4159,6 +4159,7 @@
|
||||
<string name="input_reset_positions">إعادة تعيين المواضع</string>
|
||||
<string name="input_show_label">إظهار التسمية</string>
|
||||
<string name="input_layout_import_failed">تعذّر استيراد هذا التخطيط</string>
|
||||
<string name="epic_third_party_managed">يُثبّت عبر %1$s</string>
|
||||
|
||||
<string name="theme_white_red">ثلج قرمزي</string>
|
||||
<string name="theme_white_red_detail">أسطح بيضاء مع لمسات حمراء.</string>
|
||||
|
||||
@@ -4012,6 +4012,7 @@
|
||||
<string name="input_reset_positions">Restablecer posiciones</string>
|
||||
<string name="input_show_label">Mostrar etiqueta</string>
|
||||
<string name="input_layout_import_failed">No se pudo importar esta disposición</string>
|
||||
<string name="epic_third_party_managed">Se instala mediante %1$s</string>
|
||||
<string name="theme_white_red">Nieve escarlata</string>
|
||||
<string name="theme_white_red_detail">Superficies blancas con acentos rojos.</string>
|
||||
<string name="rail_soundtracks">Bandas sonoras</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Нулиране на позициите</string>
|
||||
<string name="input_show_label">Показване на етикета</string>
|
||||
<string name="input_layout_import_failed">Това разположение не можа да бъде импортирано</string>
|
||||
<string name="epic_third_party_managed">Инсталира се чрез %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Ален сняг</string>
|
||||
<string name="theme_white_red_detail">Бели повърхности с червени акценти.</string>
|
||||
|
||||
@@ -4079,6 +4079,7 @@
|
||||
<string name="input_reset_positions">Obnovit pozice</string>
|
||||
<string name="input_show_label">Zobrazit popisek</string>
|
||||
<string name="input_layout_import_failed">Toto rozložení nelze importovat</string>
|
||||
<string name="epic_third_party_managed">Instaluje se přes %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Šarlatový sníh</string>
|
||||
<string name="theme_white_red_detail">Bílé povrchy s červenými akcenty.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Nulstil placeringer</string>
|
||||
<string name="input_show_label">Vis etiket</string>
|
||||
<string name="input_layout_import_failed">Dette layout kunne ikke importeres</string>
|
||||
<string name="epic_third_party_managed">Installeres via %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Skarlagensne</string>
|
||||
<string name="theme_white_red_detail">Hvide overflader med røde accenter.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Positionen zurücksetzen</string>
|
||||
<string name="input_show_label">Beschriftung anzeigen</string>
|
||||
<string name="input_layout_import_failed">Dieses Layout konnte nicht importiert werden</string>
|
||||
<string name="epic_third_party_managed">Wird über %1$s installiert</string>
|
||||
|
||||
<string name="theme_white_red">Scharlachroter Schnee</string>
|
||||
<string name="theme_white_red_detail">Weiße Oberflächen mit roten Akzenten.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Επαναφορά θέσεων</string>
|
||||
<string name="input_show_label">Εμφάνιση ετικέτας</string>
|
||||
<string name="input_layout_import_failed">Δεν ήταν δυνατή η εισαγωγή αυτής της διάταξης</string>
|
||||
<string name="epic_third_party_managed">Εγκαθίσταται μέσω %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Κατακόκκινο χιόνι</string>
|
||||
<string name="theme_white_red_detail">Λευκές επιφάνειες με κόκκινες λεπτομέρειες.</string>
|
||||
|
||||
@@ -4039,6 +4039,7 @@
|
||||
<string name="input_reset_positions">Restablecer posiciones</string>
|
||||
<string name="input_show_label">Mostrar etiqueta</string>
|
||||
<string name="input_layout_import_failed">No se ha podido importar esta disposición</string>
|
||||
<string name="epic_third_party_managed">Se instala mediante %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Nieve escarlata</string>
|
||||
<string name="theme_white_red_detail">Superficies blancas con acentos rojos.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Palauta sijainnit</string>
|
||||
<string name="input_show_label">Näytä nimi</string>
|
||||
<string name="input_layout_import_failed">Tätä asettelua ei voitu tuoda</string>
|
||||
<string name="epic_third_party_managed">Asennetaan sovelluksen %1$s kautta</string>
|
||||
|
||||
<string name="theme_white_red">Helakanpunainen lumi</string>
|
||||
<string name="theme_white_red_detail">Valkoiset pinnat punaisin korostuksin.</string>
|
||||
|
||||
@@ -4038,6 +4038,7 @@
|
||||
<string name="input_reset_positions">Réinitialiser les positions</string>
|
||||
<string name="input_show_label">Afficher le libellé</string>
|
||||
<string name="input_layout_import_failed">Impossible d’importer cette disposition</string>
|
||||
<string name="epic_third_party_managed">S’installe via %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Neige écarlate</string>
|
||||
<string name="theme_white_red_detail">Surfaces blanches avec des accents rouges.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">स्थितियाँ रीसेट करें</string>
|
||||
<string name="input_show_label">लेबल दिखाएँ</string>
|
||||
<string name="input_layout_import_failed">यह लेआउट इम्पोर्ट नहीं किया जा सका</string>
|
||||
<string name="epic_third_party_managed">%1$s के ज़रिए इंस्टॉल होता है</string>
|
||||
|
||||
<string name="theme_white_red">किरमिज़ी बर्फ</string>
|
||||
<string name="theme_white_red_detail">लाल रंग की झलकियों वाली सफ़ेद सतहें।</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Pozíciók visszaállítása</string>
|
||||
<string name="input_show_label">Címke megjelenítése</string>
|
||||
<string name="input_layout_import_failed">Ez az elrendezés nem importálható</string>
|
||||
<string name="epic_third_party_managed">A telepítés itt történik: %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Skarlátvörös hó</string>
|
||||
<string name="theme_white_red_detail">Fehér felületek piros kiemelésekkel.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">Atur ulang posisi</string>
|
||||
<string name="input_show_label">Tampilkan label</string>
|
||||
<string name="input_layout_import_failed">Tata letak ini tidak dapat diimpor</string>
|
||||
<string name="epic_third_party_managed">Diinstal melalui %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Salju Kirmizi</string>
|
||||
<string name="theme_white_red_detail">Permukaan putih dengan aksen merah.</string>
|
||||
|
||||
@@ -4038,6 +4038,7 @@
|
||||
<string name="input_reset_positions">Ripristina posizioni</string>
|
||||
<string name="input_show_label">Mostra etichetta</string>
|
||||
<string name="input_layout_import_failed">Impossibile importare questo layout</string>
|
||||
<string name="epic_third_party_managed">Si installa tramite %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Neve scarlatta</string>
|
||||
<string name="theme_white_red_detail">Superfici bianche con accenti rossi.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">位置をリセット</string>
|
||||
<string name="input_show_label">ラベルを表示</string>
|
||||
<string name="input_layout_import_failed">このレイアウトをインポートできませんでした</string>
|
||||
<string name="epic_third_party_managed">%1$s からインストールします</string>
|
||||
|
||||
<string name="theme_white_red">緋色の雪</string>
|
||||
<string name="theme_white_red_detail">白いサーフェスに赤のアクセント。</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">위치 초기화</string>
|
||||
<string name="input_show_label">라벨 표시</string>
|
||||
<string name="input_layout_import_failed">이 레이아웃을 가져올 수 없습니다</string>
|
||||
<string name="epic_third_party_managed">%1$s을(를) 통해 설치합니다</string>
|
||||
|
||||
<string name="theme_white_red">진홍빛 눈</string>
|
||||
<string name="theme_white_red_detail">빨간색 포인트가 있는 흰색 표면.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">Tetapkan semula kedudukan</string>
|
||||
<string name="input_show_label">Tunjukkan label</string>
|
||||
<string name="input_layout_import_failed">Susun atur ini tidak dapat diimport</string>
|
||||
<string name="epic_third_party_managed">Dipasang melalui %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Salji Merah Skarlet</string>
|
||||
<string name="theme_white_red_detail">Permukaan putih dengan aksen merah.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Tilbakestill plasseringer</string>
|
||||
<string name="input_show_label">Vis etikett</string>
|
||||
<string name="input_layout_import_failed">Kunne ikke importere dette oppsettet</string>
|
||||
<string name="epic_third_party_managed">Installeres via %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Skarlagenssnø</string>
|
||||
<string name="theme_white_red_detail">Hvite flater med røde aksenter.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Posities herstellen</string>
|
||||
<string name="input_show_label">Label tonen</string>
|
||||
<string name="input_layout_import_failed">Deze indeling kan niet worden geïmporteerd</string>
|
||||
<string name="epic_third_party_managed">Wordt geïnstalleerd via %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Scharlakenrode sneeuw</string>
|
||||
<string name="theme_white_red_detail">Witte oppervlakken met rode accenten.</string>
|
||||
|
||||
@@ -4079,6 +4079,7 @@
|
||||
<string name="input_reset_positions">Resetuj położenie</string>
|
||||
<string name="input_show_label">Pokaż etykietę</string>
|
||||
<string name="input_layout_import_failed">Nie można zaimportować tego układu</string>
|
||||
<string name="epic_third_party_managed">Instalacja przez %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Szkarłatny śnieg</string>
|
||||
<string name="theme_white_red_detail">Białe powierzchnie z czerwonymi akcentami.</string>
|
||||
|
||||
@@ -4038,6 +4038,7 @@
|
||||
<string name="input_reset_positions">Repor posições</string>
|
||||
<string name="input_show_label">Mostrar etiqueta</string>
|
||||
<string name="input_layout_import_failed">Não foi possível importar este esquema</string>
|
||||
<string name="epic_third_party_managed">Instala-se através de %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Neve Escarlate</string>
|
||||
<string name="theme_white_red_detail">Superfícies brancas com detalhes vermelhos.</string>
|
||||
|
||||
@@ -4046,6 +4046,7 @@
|
||||
<string name="input_reset_positions">Redefinir posições</string>
|
||||
<string name="input_show_label">Mostrar rótulo</string>
|
||||
<string name="input_layout_import_failed">Não foi possível importar este layout</string>
|
||||
<string name="epic_third_party_managed">Instala-se através de %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Neve Escarlate</string>
|
||||
<string name="theme_white_red_detail">Superfícies brancas com detalhes em vermelho.</string>
|
||||
|
||||
@@ -4039,6 +4039,7 @@
|
||||
<string name="input_reset_positions">Resetează pozițiile</string>
|
||||
<string name="input_show_label">Afișează eticheta</string>
|
||||
<string name="input_layout_import_failed">Acest aranjament nu a putut fi importat</string>
|
||||
<string name="epic_third_party_managed">Se instalează prin %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Zăpadă stacojie</string>
|
||||
<string name="theme_white_red_detail">Suprafețe albe cu accente roșii.</string>
|
||||
|
||||
@@ -4079,6 +4079,7 @@
|
||||
<string name="input_reset_positions">Сбросить положение</string>
|
||||
<string name="input_show_label">Показывать подпись</string>
|
||||
<string name="input_layout_import_failed">Не удалось импортировать эту раскладку</string>
|
||||
<string name="epic_third_party_managed">Устанавливается через %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Алый снег</string>
|
||||
<string name="theme_white_red_detail">Белые поверхности с красными акцентами.</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Återställ positioner</string>
|
||||
<string name="input_show_label">Visa etikett</string>
|
||||
<string name="input_layout_import_failed">Det gick inte att importera layouten</string>
|
||||
<string name="epic_third_party_managed">Installeras via %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Scharlakansröd snö</string>
|
||||
<string name="theme_white_red_detail">Vita ytor med röda accenter.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">รีเซ็ตตำแหน่ง</string>
|
||||
<string name="input_show_label">แสดงป้ายกำกับ</string>
|
||||
<string name="input_layout_import_failed">ไม่สามารถนำเข้าการจัดวางนี้ได้</string>
|
||||
<string name="epic_third_party_managed">ติดตั้งผ่าน %1$s</string>
|
||||
|
||||
<string name="theme_white_red">หิมะสีแดงชาด</string>
|
||||
<string name="theme_white_red_detail">พื้นผิวสีขาวมีสีแดงเป็นสีเน้น</string>
|
||||
|
||||
@@ -3999,6 +3999,7 @@
|
||||
<string name="input_reset_positions">Konumları sıfırla</string>
|
||||
<string name="input_show_label">Etiketi göster</string>
|
||||
<string name="input_layout_import_failed">Bu düzen içe aktarılamadı</string>
|
||||
<string name="epic_third_party_managed">%1$s üzerinden yüklenir</string>
|
||||
|
||||
<string name="theme_white_red">Kızıl Kar</string>
|
||||
<string name="theme_white_red_detail">Kırmızı vurgulu beyaz yüzeyler.</string>
|
||||
|
||||
@@ -4079,6 +4079,7 @@
|
||||
<string name="input_reset_positions">Скинути розташування</string>
|
||||
<string name="input_show_label">Показувати підпис</string>
|
||||
<string name="input_layout_import_failed">Не вдалося імпортувати цю розкладку</string>
|
||||
<string name="epic_third_party_managed">Встановлюється через %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Багряний сніг</string>
|
||||
<string name="theme_white_red_detail">Білі поверхні з червоними акцентами.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">Đặt lại vị trí</string>
|
||||
<string name="input_show_label">Hiện nhãn</string>
|
||||
<string name="input_layout_import_failed">Không thể nhập bố cục này</string>
|
||||
<string name="epic_third_party_managed">Cài đặt qua %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Tuyết đỏ thẫm</string>
|
||||
<string name="theme_white_red_detail">Bề mặt trắng với điểm nhấn màu đỏ.</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">重置位置</string>
|
||||
<string name="input_show_label">显示标签</string>
|
||||
<string name="input_layout_import_failed">无法导入此布局</string>
|
||||
<string name="epic_third_party_managed">通过 %1$s 安装</string>
|
||||
|
||||
<string name="theme_white_red">猩红之雪</string>
|
||||
<string name="theme_white_red_detail">白色界面配红色点缀。</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">重設位置</string>
|
||||
<string name="input_show_label">顯示標籤</string>
|
||||
<string name="input_layout_import_failed">無法匯入此佈局</string>
|
||||
<string name="epic_third_party_managed">透過 %1$s 安裝</string>
|
||||
|
||||
<string name="theme_white_red">緋紅之雪</string>
|
||||
<string name="theme_white_red_detail">白色表面配紅色點綴。</string>
|
||||
|
||||
@@ -3969,6 +3969,7 @@
|
||||
<string name="input_reset_positions">重設位置</string>
|
||||
<string name="input_show_label">顯示標籤</string>
|
||||
<string name="input_layout_import_failed">無法匯入此版面配置</string>
|
||||
<string name="epic_third_party_managed">透過 %1$s 安裝</string>
|
||||
|
||||
<string name="theme_white_red">緋紅之雪</string>
|
||||
<string name="theme_white_red_detail">白色表面搭配紅色點綴。</string>
|
||||
|
||||
@@ -4077,6 +4077,7 @@
|
||||
<string name="input_reset_positions">Reset positions</string>
|
||||
<string name="input_show_label">Show label</string>
|
||||
<string name="input_layout_import_failed">Could not import this layout</string>
|
||||
<string name="epic_third_party_managed">Installs through %1$s</string>
|
||||
|
||||
<string name="theme_white_red">Scarlet Snow</string>
|
||||
<string name="theme_white_red_detail">White surfaces with red accents.</string>
|
||||
|
||||
@@ -51,6 +51,20 @@ fn attribute_of(entry: &Value, name: &str) -> Option<String> {
|
||||
.map(str::to_string)
|
||||
}
|
||||
|
||||
fn third_party_managed_app(entry: &Value) -> Option<String> {
|
||||
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"], "");
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,9 @@ pub struct Request {
|
||||
|
||||
impl Request {
|
||||
pub fn from_json(v: &Value) -> Result<Request, String> {
|
||||
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('/') {
|
||||
|
||||
@@ -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<String, Vec<u8>>, hits: Arc<AtomicUsize>) -> String {
|
||||
let listener = TcpListener::bind("127.0.0.1:0").unwrap();
|
||||
let addr = listener.local_addr().unwrap();
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user