diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt index fdd4db2495..f0eae9767f 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstall.kt @@ -111,16 +111,22 @@ object BattleNetInstall { fun update(context: Context, game: InstalledStoreGame) { val app = context.applicationContext Thread({ - val item = CatalogItem( - Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, - extra = mapOf(INSTALL_UID to installUid(app, game)), - ) + val item = updateItem(game, installUid(app, game)) game.folder.parentFile?.parentFile?.let { com.droiddeck.launcher.stores.download.SavedQueue.remember(app, item, it) } enqueue(app, item, game.folder, update = true) }, "battlenet-update").start() } + internal fun updateItem(game: InstalledStoreGame, uid: String) = CatalogItem( + Store.BATTLENET, game.sidecar.id, game.sidecar.title, game.sidecar.hero, tallImageUrl = game.sidecar.cover, owned = true, + extra = mapOf(INSTALL_UID to uid, UPDATE_FOLDER to game.folder.absolutePath), + ) + + internal fun updateFolder(item: CatalogItem): File? = item.extra[UPDATE_FOLDER]?.let(::File) + internal const val INSTALL_UID = "installUid" + internal const val UPDATE_FOLDER = "updateFolder" + internal const val STALLED = "stalled" internal fun installUid(context: Context, game: InstalledStoreGame): String = runCatching { BattleNet.games(context).firstOrNull { it.uid == game.sidecar.id }?.installUid }.getOrNull() ?: game.sidecar.id @@ -219,6 +225,7 @@ object BattleNetInstall { val detail = when { reason == null -> "exit $code" reason == "client" -> return context.getString(R.string.bnet_dl_client_first) + reason == STALLED -> return context.getString(R.string.bnet_dl_stalled) reason.startsWith("agent ") -> context.getString(R.string.bnet_dl_agent_error, reason.removePrefix("agent ")) else -> reason.removePrefix("stopped ") } diff --git a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt index 403b867538..426d3616a9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/battlenet/BattleNetStore.kt @@ -192,6 +192,7 @@ object BattleNetBackend : StoreBackend { override fun install(context: Context, item: CatalogItem, root: File) { if (!BattleNetInstall.headless(item)) return BattleNetClient.installGame(context, item.id, root) val app = context.applicationContext + BattleNetInstall.updateFolder(item)?.let { return BattleNetInstall.enqueue(app, item, it, update = true) } BattleNetInstall.enqueue(app, item, StoreInstallRoot.folderFor(app, store, item.id, item.title, root)) } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fc3a68d12b..7f85d0b48e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2605,6 +2605,7 @@ في انتظار تنزيل Battle.net الآخر… افتح Battle.net وسجّل الدخول مرة واحدة، ثم ثبّت ألعابه من هنا. توقفت أداة التنزيل من Blizzard: %1$s + توقفت أداة التنزيل من Blizzard عن التقدم. خطأ Blizzard %1$s تحديث ألعاب Blizzard 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 0a11b9e776..4df2942308 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2571,6 +2571,7 @@ Esperando la otra descarga de Battle.net… Abre Battle.net e inicia sesión una vez; luego instala sus juegos desde aquí. El descargador de Blizzard se detuvo: %1$s + El descargador de Blizzard dejó de avanzar. Error de Blizzard %1$s Actualizar Juegos de Blizzard diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 3c13f1b753..a1b25df939 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2501,6 +2501,7 @@ Изчакване на другото изтегляне от Battle.net… Отворете Battle.net и влезте веднъж, след това инсталирайте игрите му оттук. Програмата за изтегляне на Blizzard спря: %1$s + Програмата за изтегляне на Blizzard спря да напредва. Грешка на Blizzard %1$s Актуализиране Игри на Blizzard diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 34afc84da9..1bff370cb9 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2553,6 +2553,7 @@ Čekání na druhé stahování z Battle.net… Otevřete Battle.net a jednou se přihlaste, pak instalujte jeho hry odsud. Stahovač Blizzardu se zastavil: %1$s + Stahovač Blizzardu přestal postupovat. Chyba Blizzardu %1$s Aktualizovat Hry od Blizzardu diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c96ed3820e..92cb365844 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2501,6 +2501,7 @@ Venter på den anden Battle.net-download… Åbn Battle.net, og log ind én gang, og installer derefter dets spil herfra. Blizzards downloader stoppede: %1$s + Blizzards downloader holdt op med at gøre fremskridt. Blizzard-fejl %1$s Opdater Blizzard-spil diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 134515a891..023270ad4a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2493,6 +2493,7 @@ Warten auf den anderen Battle.net-Download… Öffne Battle.net und melde dich einmal an, dann installiere seine Spiele hier. Blizzards Downloader wurde beendet: %1$s + Blizzards Downloader kommt nicht mehr voran. Blizzard-Fehler %1$s Aktualisieren Blizzard-Spiele diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index acb11e1eec..06eb0360d5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2501,6 +2501,7 @@ Αναμονή για την άλλη λήψη από το Battle.net… Ανοίξτε το Battle.net και συνδεθείτε μία φορά, έπειτα εγκαταστήστε τα παιχνίδια του από εδώ. Το πρόγραμμα λήψης της Blizzard σταμάτησε: %1$s + Το πρόγραμμα λήψης της Blizzard σταμάτησε να προχωρά. Σφάλμα Blizzard %1$s Ενημέρωση Παιχνίδια της Blizzard diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 224a8f59cb..368eae4dbf 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2527,6 +2527,7 @@ Esperando a la otra descarga de Battle.net… Abre Battle.net e inicia sesión una vez; después instala sus juegos desde aquí. El descargador de Blizzard se ha detenido: %1$s + El descargador de Blizzard ha dejado de avanzar. Error de Blizzard %1$s Actualizar Juegos de Blizzard diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index c1aa0d9083..e3352837fa 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2501,6 +2501,7 @@ Odotetaan toista Battle.net-latausta… Avaa Battle.net ja kirjaudu sisään kerran, asenna sitten sen pelit täältä. Blizzardin latausohjelma pysähtyi: %1$s + Blizzardin latausohjelma lakkasi etenemästä. Blizzard-virhe %1$s Päivitä Blizzardin pelit diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5544d8f5fd..b84be7d3bb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2526,6 +2526,7 @@ En attente de l\'autre téléchargement Battle.net… Ouvrez Battle.net et connectez-vous une fois, puis installez ses jeux ici. Le téléchargeur de Blizzard s\'est arrêté : %1$s + Le téléchargeur de Blizzard n\'avance plus. Erreur Blizzard %1$s Mettre à jour Jeux Blizzard diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index da5307b714..ddd33a79d0 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2501,6 +2501,7 @@ दूसरे Battle.net डाउनलोड का इंतज़ार… Battle.net खोलें और एक बार साइन इन करें, फिर इसके गेम यहाँ से इंस्टॉल करें। Blizzard का डाउनलोडर रुक गया: %1$s + Blizzard का डाउनलोडर आगे नहीं बढ़ रहा। Blizzard त्रुटि %1$s अपडेट करें Blizzard के गेम diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 3778e08320..0e759a2c85 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2501,6 +2501,7 @@ Várakozás a másik Battle.net-letöltésre… Nyisd meg a Battle.netet, és jelentkezz be egyszer, majd innen telepítsd a játékait. A Blizzard letöltője leállt: %1$s + A Blizzard letöltője nem halad tovább. Blizzard-hiba: %1$s Frissítés Blizzard-játékok diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index b8208ba633..9096439ca9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2476,6 +2476,7 @@ Menunggu unduhan Battle.net lainnya… Buka Battle.net dan masuk sekali, lalu instal gamenya dari sini. Pengunduh Blizzard berhenti: %1$s + Pengunduh Blizzard berhenti berjalan. Kesalahan Blizzard %1$s Perbarui Game Blizzard diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e4b446af4b..7cedfc55c4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2518,6 +2518,7 @@ In attesa dell\'altro download di Battle.net… Apri Battle.net ed esegui l\'accesso una volta, poi installa qui i suoi giochi. Il downloader di Blizzard si è fermato: %1$s + Il downloader di Blizzard ha smesso di avanzare. Errore Blizzard %1$s Aggiorna Giochi Blizzard diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 91e779bd6e..2677770caa 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2476,6 +2476,7 @@ もう一つの Battle.net のダウンロードを待っています… Battle.net を開いて一度サインインしてから、ここでゲームをインストールしてください。 Blizzard のダウンローダーが停止しました: %1$s + Blizzard のダウンローダーが進まなくなりました。 Blizzard エラー %1$s アップデート Blizzard のゲーム diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 9a16daf7de..ab8ddf62f2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2476,6 +2476,7 @@ 다른 Battle.net 다운로드를 기다리는 중… Battle.net을 열고 한 번 로그인한 다음 여기에서 게임을 설치하세요. Blizzard 다운로더가 중지됨: %1$s + Blizzard 다운로더가 더 이상 진행되지 않습니다. Blizzard 오류 %1$s 업데이트 Blizzard 게임 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 726edcd452..e6054e288d 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2476,6 +2476,7 @@ Menunggu muat turun Battle.net yang lain… Buka Battle.net dan log masuk sekali, kemudian pasang permainannya dari sini. Pemuat turun Blizzard berhenti: %1$s + Pemuat turun Blizzard berhenti bergerak. Ralat Blizzard %1$s Kemas kini Permainan Blizzard diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 03cceb6dff..af3ee5933f 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2501,6 +2501,7 @@ Venter på den andre Battle.net-nedlastingen… Åpne Battle.net og logg på én gang, og installer deretter spillene herfra. Blizzards nedlaster stoppet: %1$s + Blizzards nedlaster sluttet å gjøre fremgang. Blizzard-feil %1$s Oppdater Blizzard-spill diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2d02446e51..e7234f03d5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2501,6 +2501,7 @@ Wachten op de andere Battle.net-download… Open Battle.net en meld je één keer aan, installeer daarna de games hier. Blizzards downloader is gestopt: %1$s + Blizzards downloader maakt geen voortgang meer. Blizzard-fout %1$s Bijwerken Blizzard-games diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d1813d6ebe..48d92490c2 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2553,6 +2553,7 @@ Oczekiwanie na drugie pobieranie z Battle.net… Otwórz Battle.net i zaloguj się raz, a potem instaluj jego gry tutaj. Program pobierający Blizzarda zatrzymał się: %1$s + Program pobierający Blizzarda przestał robić postępy. Błąd Blizzarda %1$s Aktualizuj Gry Blizzarda diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index df607acd02..bba489d30a 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2518,6 +2518,7 @@ A aguardar a outra transferência do Battle.net… Abra o Battle.net e inicie sessão uma vez; depois instale os jogos dele aqui. O programa de transferência da Blizzard parou: %1$s + O programa de transferência da Blizzard deixou de avançar. Erro da Blizzard %1$s Atualizar Jogos da Blizzard diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 29e6152dfa..786e7ffc9f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2519,6 +2519,7 @@ Aguardando o outro download do Battle.net… Abra o Battle.net e entre uma vez; depois instale os jogos dele aqui. O downloader da Blizzard parou: %1$s + O downloader da Blizzard parou de avançar. Erro da Blizzard %1$s Atualizar Jogos da Blizzard diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index ac3b76c54c..024db62c03 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2527,6 +2527,7 @@ Se așteaptă cealaltă descărcare Battle.net… Deschide Battle.net și conectează-te o dată, apoi instalează jocurile de aici. Programul de descărcare Blizzard s-a oprit: %1$s + Programul de descărcare Blizzard nu mai avansează. Eroare Blizzard %1$s Actualizează Jocuri Blizzard diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 81f4f3370c..b293f9c475 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2553,6 +2553,7 @@ Ожидание другой загрузки Battle.net… Откройте Battle.net и войдите один раз, затем устанавливайте его игры здесь. Загрузчик Blizzard остановился: %1$s + Загрузчик Blizzard перестал продвигаться. Ошибка Blizzard %1$s Обновить Игры Blizzard diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f560640f76..804e397fc7 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2501,6 +2501,7 @@ Väntar på den andra Battle.net-nedladdningen… Öppna Battle.net och logga in en gång, installera sedan dess spel här. Blizzards nedladdare stoppades: %1$s + Blizzards nedladdare slutade göra framsteg. Blizzard-fel %1$s Uppdatera Blizzard-spel diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 06a2ed2cd5..e773c3f043 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2476,6 +2476,7 @@ กำลังรอการดาวน์โหลด Battle.net อีกรายการ… เปิด Battle.net และลงชื่อเข้าใช้หนึ่งครั้ง แล้วติดตั้งเกมจากที่นี่ ตัวดาวน์โหลดของ Blizzard หยุดทำงาน: %1$s + ตัวดาวน์โหลดของ Blizzard ไม่คืบหน้า ข้อผิดพลาดของ Blizzard %1$s อัปเดต เกมของ Blizzard diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 33e9152668..31a6bf9165 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2493,6 +2493,7 @@ Diğer Battle.net indirmesi bekleniyor… Battle.net\'i açıp bir kez oturum açın, ardından oyunlarını buradan yükleyin. Blizzard indiricisi durdu: %1$s + Blizzard indiricisi ilerlemeyi durdurdu. Blizzard hatası %1$s Güncelle Blizzard oyunları diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index bc0f9f4b83..cf4fca1a71 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2553,6 +2553,7 @@ Очікування іншого завантаження Battle.net… Відкрийте Battle.net і увійдіть один раз, потім встановлюйте його ігри тут. Завантажувач Blizzard зупинився: %1$s + Завантажувач Blizzard перестав просуватися. Помилка Blizzard %1$s Оновити Ігри Blizzard diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 5da35222aa..145bd62237 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2476,6 +2476,7 @@ Đang chờ lượt tải Battle.net khác… Mở Battle.net và đăng nhập một lần, sau đó cài trò chơi của nó tại đây. Trình tải xuống của Blizzard đã dừng: %1$s + Trình tải xuống của Blizzard không còn tiến triển. Lỗi Blizzard %1$s Cập nhật Trò chơi Blizzard diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4b50bd95a7..65e48021b5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2553,6 +2553,7 @@ 正在等待另一个 Battle.net 下载… 请先打开 Battle.net 并登录一次,然后在这里安装其游戏。 暴雪下载器已停止:%1$s + 暴雪下载器已停止进展。 暴雪错误 %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 89a15f33df..512ebecb02 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2473,6 +2473,7 @@ 正在等待另一個 Battle.net 下載… 請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。 暴雪下載器已停止:%1$s + 暴雪下載器已停止進展。 暴雪錯誤 %1$s 更新 Blizzard 遊戲 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index dcdfb41be2..b92a9adae8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2473,6 +2473,7 @@ 正在等待另一個 Battle.net 下載… 請先開啟 Battle.net 並登入一次,然後在這裡安裝其遊戲。 暴雪下載器已停止:%1$s + 暴雪下載器已停止進度。 暴雪錯誤 %1$s 更新 Blizzard 遊戲 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3bb9dde90f..02c7a61c2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2636,6 +2636,7 @@ Waiting for the other Battle.net download… Open Battle.net and sign in once, then install its games here. Blizzard\'s downloader stopped: %1$s + Blizzard\'s downloader stopped making progress. Blizzard error %1$s Update Blizzard games diff --git a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt index 05a5708158..92d1716292 100644 --- a/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/stores/battlenet/BattleNetInstallTest.kt @@ -2,12 +2,15 @@ package com.droiddeck.launcher.stores.battlenet import com.droiddeck.launcher.runtime.BattleNet import com.droiddeck.launcher.stores.CatalogItem +import com.droiddeck.launcher.stores.InstalledStoreGame import com.droiddeck.launcher.stores.Store +import com.droiddeck.launcher.stores.StoreGameSidecar import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertTrue import org.junit.Test +import java.io.File import java.nio.file.Files import java.util.Locale @@ -89,4 +92,13 @@ class BattleNetInstallTest { assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1003, 2000, 1, 9)) assertEquals(BattleNetInstall.Step.APPLYING, BattleNetInstall.step(1004, 1000, 0, 0)) } + + @Test fun aSavedUpdateComesBackAsAnUpdateOfItsOwnFolder() { + val folder = File("/data/Games/Stores/Battle.net/World of Warcraft") + val game = InstalledStoreGame(StoreGameSidecar(Store.BATTLENET, "wow", "World of Warcraft", "Wow.exe"), folder) + val item = BattleNetInstall.updateItem(game, "wow_enus") + assertEquals("wow_enus", item.extra[BattleNetInstall.INSTALL_UID]) + assertEquals(folder, BattleNetInstall.updateFolder(item)) + assertNull(BattleNetInstall.updateFolder(CatalogItem(Store.BATTLENET, "wow", "World of Warcraft", null))) + } } diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet index 3473e7dead..b43bd25a6f 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-battlenet @@ -88,6 +88,8 @@ COUNTRY = re.compile(r"[A-Z]{3}") REGION = re.compile(r"[A-Z]{2}") REPORT = "BNET" ETA_LIMIT = 30 * 86400 +STALL = 600 +MOVING = ("download_current", "download_total", "progress", "playable_progress", "state", "phase", "paused", "error") DONE_STATE = 1004 REPORTED = ("progress", "playable_progress", "download_rate", "download_remaining", "estimated_time_in_sec", "state", "playable", "paused", "download_complete", "installed", "error") @@ -118,6 +120,12 @@ function field(text, name) { return m ? m[1] : ""; } +function job(text) { + if (/"error"\s*:\s*[1-9]/.test(text)) return false; + var bare = text.replace(/"extended_status"\s*:\s*\{[^}]*\}/, ""); + return /"state"\s*:\s*\d+/.test(bare) || /"download_current"\s*:/.test(bare); +} + function install() { // Blizzard's China repository moved to cn.patch.battlenet.com.cn; cn.patch.battle.net only redirects away from it. var patch = zone == "cn" ? "cn.patch.battlenet.com.cn" : zone + ".patch.battle.net"; @@ -140,7 +148,7 @@ function watch(path) { if (/"error"\s*:\s*[1-9]/.test(s)) break; var state = /"state"\s*:\s*(\d+)/.exec(s.replace(/"extended_status"\s*:\s*\{[^}]*\}/, "")), complete = /"download_complete"\s*:\s*true/.test(s); state = state ? +state[1] : 0; - if (state == 1000 || state == 1003 || !complete) started = true; + if (state == 1000 || state == 1003 || job(s) && !complete) started = true; if (started && (state == 1004 || complete && /"playable"\s*:\s*true/.test(s))) break; if (!started && state == 1004 && i >= 20) break; if (!started && i >= 180) { @@ -1376,7 +1384,7 @@ def summary(status): return out -def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None): +def agent_job(root, action, uid, product="", folder="", locale="enUS", country="USA", region="US", poll=None, wait=None, stall=None): pfx = os.path.join(prefix(root), "pfx") if not installed(root) or agent_exe(root) is None: emit("ERROR", "client") @@ -1432,6 +1440,7 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" os.replace(output, output + ".1") except OSError: pass + before = {pid for pid, _ in wine_processes(pfx)} with open(output, "ab") as log: try: child = subprocess.Popen(cmd, stdin=subprocess.DEVNULL, stdout=log, stderr=log, env=env) @@ -1439,6 +1448,9 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" emit("ERROR", "stopped gamescope: %s" % error) return 1 seen = None + mark = None + moved = time.monotonic() + stalled = False while True: done = child.poll() is not None status = read_status(base + ".json") @@ -1447,12 +1459,27 @@ def agent_job(root, action, uid, product="", folder="", locale="enUS", country=" if brief != seen: emit("PROGRESS", json.dumps(brief, sort_keys=True)) seen = brief + signature = tuple(brief.get(key) for key in MOVING) + if signature != mark: + mark = signature + moved = time.monotonic() if done: break + if action != "uninstall" and time.monotonic() - moved > (STALL if stall is None else stall): + say("the %s of %s made no progress for %d s; stopping it" % (action, uid, STALL if stall is None else stall)) + stalled = True + child.kill() + child.wait() + break time.sleep(POLL if poll is None else poll) leftovers = wine_processes(pfx) if leftovers and idle(leftovers): stop(leftovers) + elif stalled: + stop([(pid, argv) for pid, argv in leftovers if pid not in before and program(argv) == AGENT]) + if stalled: + emit("ERROR", "stalled") + return 6 answer = read_status(base + ".game") game = answer or {} status = read_status(base + ".json") or {} diff --git a/tools/tests/test_battlenet.py b/tools/tests/test_battlenet.py index ec20e81777..2dbe844e72 100644 --- a/tools/tests/test_battlenet.py +++ b/tools/tests/test_battlenet.py @@ -1441,6 +1441,138 @@ class AgentJobTest(Harness): self.assertEqual(BNET["agent_job"](self.root, "update", "gryphon", poll=0), 1) self.assertEqual(self.lines[-1][0], "ERROR") + def test_a_job_that_stops_moving_is_ended_as_stalled_and_its_agent_stopped(self): + self.install() + self.files = {".json": json.dumps({"state": 1003, "paused": True, "download_current": [10, 0, 0], "download_total": [99, 0, 0]})} + killed = [] + stopped = [] + + class Hung: + returncode = None + + def __init__(self, cmd, **kwargs): + base = cmd[-1][2:].replace("\\", "/") + with open(base + ".json", "wb") as f: + f.write(self_files[".json"].encode("utf-16")) + + def poll(self): + return None + + def kill(self): + killed.append(True) + + def wait(self): + return -9 + + self_files = self.files + with mock.patch.object(BNET["subprocess"], "Popen", Hung), \ + mock.patch.dict(BNET, {"wine_processes": lambda pfx: [(5, ["agent.exe"])], "stop": lambda p: stopped.append(p)}): + code = BNET["agent_job"](self.root, "install", "s1", "s1", str(self.tmp / "S1"), "enUS", "USA", "US", poll=0, stall=0.05) + self.assertEqual(code, 6) + self.assertEqual(killed, [True]) + self.assertEqual(stopped, [[(5, ["agent.exe"])]]) + self.assertEqual(self.lines[-1], ("ERROR", "stalled")) + + def test_a_stalled_job_leaves_a_game_or_client_in_the_prefix_running(self): + self.install() + self.files = {".json": json.dumps({"state": 1003, "download_current": [10, 0, 0], "download_total": [99, 0, 0]})} + stopped = [] + calls = [] + + class Hung: + returncode = None + + def __init__(self, cmd, **kwargs): + calls.append(True) + + def poll(self): + return None + + def kill(self): + pass + + def wait(self): + return -9 + + def processes(pfx): + if not calls: + return [(3, ["agent.exe"])] + return [(3, ["agent.exe"]), (5, ["Agent.exe"]), (6, ["wineserver"]), (7, ["Wow.exe"])] + + with mock.patch.object(BNET["subprocess"], "Popen", Hung), \ + mock.patch.dict(BNET, {"wine_processes": processes, "stop": lambda p: stopped.append(p)}): + code = BNET["agent_job"](self.root, "install", "s1", "s1", str(self.tmp / "S1"), "enUS", "USA", "US", poll=0, stall=0.05) + self.assertEqual(code, 6) + self.assertEqual(stopped, [[(5, ["Agent.exe"])]]) + + def test_only_a_changing_rate_or_estimate_does_not_hold_off_the_stall(self): + self.install() + clock = [0.0] + + class Spinning: + returncode = None + + def __init__(self, cmd, **kwargs): + self.base = cmd[-1][2:].replace("\\", "/") + self.polls = 0 + + def poll(self): + self.polls += 1 + if self.polls > 10: + raise AssertionError("the stall timeout never ended the job") + clock[0] += 10 + with open(self.base + ".json", "wb") as f: + f.write(json.dumps({"state": 1003, "download_current": [4, 0, 0], "download_total": [9, 0, 0], + "download_rate": self.polls, "estimated_time_in_sec": self.polls}).encode("utf-16")) + return None + + def kill(self): + pass + + def wait(self): + return -9 + + fake = mock.Mock(monotonic=lambda: clock[0], sleep=lambda s: None) + with mock.patch.object(BNET["subprocess"], "Popen", Spinning), mock.patch.dict(BNET, {"time": fake, "stop": lambda p: None}): + code = BNET["agent_job"](self.root, "update", "gryphon", poll=0, stall=25) + self.assertEqual(code, 6) + self.assertEqual(self.lines[-1], ("ERROR", "stalled")) + + def test_a_moving_job_is_not_ended_as_stalled(self): + self.install() + done = json.dumps({"installed": True, "playable": True, "install_dir": "Z:/g", "local_version": "2"}) + clock = [0.0] + + class Moving: + returncode = 0 + + def __init__(self, cmd, **kwargs): + self.base = cmd[-1][2:].replace("\\", "/") + self.polls = 0 + + def poll(self): + self.polls += 1 + clock[0] += 10 + with open(self.base + ".json", "wb") as f: + f.write(json.dumps({"state": 1003, "download_current": [self.polls, 0, 0], "download_total": [9, 0, 0]}).encode("utf-16")) + if self.polls < 6: + return None + with open(self.base + ".game", "wb") as f: + f.write(done.encode("utf-16")) + return 0 + + fake = mock.Mock(monotonic=lambda: clock[0], sleep=lambda s: None) + with mock.patch.object(BNET["subprocess"], "Popen", Moving), mock.patch.dict(BNET, {"time": fake}): + code = BNET["agent_job"](self.root, "update", "gryphon", poll=0, stall=15) + self.assertEqual(code, 0) + self.assertNotIn(("ERROR", "stalled"), self.lines) + + def test_only_a_real_job_reply_counts_as_started(self): + script = BNET["AGENT_SCRIPT"] + self.assertIn("if (state == 1000 || state == 1003 || job(s) && !complete) started = true;", script) + self.assertIn('return /"state"\\s*:\\s*\\d+/.test(bare) || /"download_current"\\s*:/.test(bare);', script) + self.assertIn('if (/"error"\\s*:\\s*[1-9]/.test(text)) return false;', script) + def test_the_driver_only_stops_once_the_agent_has_really_run(self): script = BNET["AGENT_SCRIPT"] self.assertIn("if (started && (state == 1004 || complete && /\"playable\"\\s*:\\s*true/.test(s))) break;", script)