diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 63dfb00755..c9dfb374fa 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -212,6 +212,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var gestureConfig = com.droiddeck.launcher.input.TouchGestureConfig() private var gestureGame: String? = null private var gestureSettingsOpen by mutableStateOf(false) + private var steamImportAsk by mutableStateOf(null) + private var steamImportAnswered: String? = null private var directHoldBehavior by mutableStateOf(com.droiddeck.launcher.input.TouchGestureConfig.MOUSE_BEHAVIOR_CLICK) private var screenKeyPickerOpen by mutableStateOf(false) private var screenKeyBind: List? = null @@ -902,6 +904,29 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } com.droiddeck.launcher.ui.GestureFeedback(recognizedGesture) + LaunchedEffect(Unit) { + val root = LinuxRuntime.rootDir(this@SessionActivity) + while (true) { + val ask = if (SessionState.running && SessionState.mode == SessionService.MODE_STEAM) { + kotlinx.coroutines.withContext(kotlinx.coroutines.Dispatchers.IO) { com.droiddeck.launcher.session.SteamImportPrompt.read(root) } + } else null + steamImportAsk = ask?.takeIf { it.token != steamImportAnswered } + kotlinx.coroutines.delay(1500) + } + } + steamImportAsk?.takeIf { !loading.visible }?.let { ask -> + androidx.compose.runtime.key(ask.token) { + com.droiddeck.launcher.ui.SteamImportDialog(ask.games) { now -> + val root = LinuxRuntime.rootDir(this@SessionActivity) + Thread({ + if (com.droiddeck.launcher.session.SteamImportPrompt.answer(root, ask.token, now)) runOnUiThread { + steamImportAnswered = ask.token + if (steamImportAsk?.token == ask.token) steamImportAsk = null + } + }, "steam-import-answer").start() + } + } + } if (gestureSettingsOpen) com.droiddeck.launcher.ui.TouchGestureDialog( game = gestureGame, onDismiss = { gestureSettingsOpen = false }, diff --git a/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt b/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt new file mode 100644 index 0000000000..736db34d9a --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/session/SteamImportPrompt.kt @@ -0,0 +1,26 @@ +package com.droiddeck.launcher.session + +import org.json.JSONObject +import java.io.File + +object SteamImportPrompt { + data class Ask(val token: String, val games: List) + + private fun folder(root: File) = File(root, "root/.cache/droiddeck") + + fun read(root: File): Ask? { + val text = runCatching { File(folder(root), "steam-import.json").readText() }.getOrNull() ?: return null + val json = runCatching { JSONObject(text) }.getOrNull() ?: return null + val token = json.optString("token").takeIf { it.isNotEmpty() } ?: return null + val list = json.optJSONArray("games") + val games = if (list == null) emptyList() else (0 until list.length()).mapNotNull { list.optString(it).takeIf(String::isNotBlank) } + return Ask(token, games) + } + + fun answer(root: File, token: String, now: Boolean): Boolean = runCatching { + val dir = folder(root).apply { mkdirs() } + val temp = File(dir, "steam-import.answer.tmp") + temp.writeText(JSONObject().put("token", token).put("choice", if (now) "now" else "later").toString()) + temp.renameTo(File(dir, "steam-import.answer")) + }.getOrDefault(false) +} diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SteamImportDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/SteamImportDialog.kt new file mode 100644 index 0000000000..b262504ddb --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/SteamImportDialog.kt @@ -0,0 +1,45 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.RestartAlt +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.droiddeck.launcher.R + +@Composable +internal fun SteamImportDialog(games: List, onAnswer: (Boolean) -> Unit) { + val now = remember { booleanArrayOf(false) } + val shown = rememberShown { onAnswer(now[0]) } + val close = { shown.targetState = false } + val focus = remember { FocusRequester() } + LaunchedEffect(Unit) { runCatching { focus.requestFocus() } } + val names = if (games.size <= 3) games.joinToString(", ") + else stringResource(R.string.steam_import_names_more, games.take(3).joinToString(", "), games.size - 3) + AppDialog(shown, close, "steamImport", wide = false, maxWidth = 520.dp) { + DialogTitleRow(stringResource(R.string.steam_import_title), close) { + Icon(Icons.Filled.RestartAlt, null, tint = LocalPalette.current.signal, modifier = Modifier.size(20.dp)) + } + Text( + stringResource(R.string.steam_import_body, names), + fontSize = 13.sp, lineHeight = 18.sp, color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + Row(horizontalArrangement = Arrangement.spacedBy(10.dp, androidx.compose.ui.Alignment.End), modifier = Modifier.fillMaxWidth()) { + SecondaryButton(stringResource(R.string.steam_import_later)) { now[0] = false; close() } + PrimaryButton(stringResource(R.string.steam_import_now), modifier = Modifier.focusRequester(focus), onClick = { now[0] = true; close() }) + } + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index fbedfda846..6f1e416824 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -3351,4 +3351,9 @@ %1$s متصل عبر %2$s (%3$s ميغابت/ث، حوالي %4$d ميغابايت/ث). لا يدعم منفذ USB في هذا الجهاز سرعة أعلى، لذا ستُحمَّل الألعاب عليه ببطء. قد تكون الذاكرة الداخلية أو بطاقة microSD أسرع. عدم الإظهار مرة أخرى إغلاق + هل تريد إعادة تشغيل Steam لإضافة ألعابك؟ + يمكن لـ Steam إدراج هذه الألعاب التي تملكها كألعاب مثبتة: %1$s. يجب إعادة تشغيله لإظهارها. أعد التشغيل الآن، أو ستُضاف في المرة القادمة التي يبدأ فيها Steam. + %1$s و%2$d أخرى + إعادة التشغيل الآن + لاحقًا 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 c490d67864..7aff2ca582 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -3198,4 +3198,9 @@ %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no admite más velocidad, así que los juegos cargarán lento. El almacenamiento interno o una microSD pueden ser más rápidos. No volver a mostrar Descartar + ¿Reiniciar Steam para agregar tus juegos? + Steam puede mostrar como instalados estos juegos que tienes: %1$s. Tiene que reiniciarse para mostrarlos. Reinicia ahora o se agregarán la próxima vez que Steam se inicie. + %1$s y %2$d más + Reiniciar ahora + Más tarde diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d474e1eedb..3f998b5437 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -3211,4 +3211,9 @@ %1$s е свързан чрез %2$s (%3$s Mbps, около %4$d MB/s). USB портът на това устройство не поддържа по-висока скорост, затова игрите ще се зареждат бавно. Вътрешната памет или microSD карта може да са по-бързи. Не показвай отново Затвори + Да се рестартира ли Steam, за да добави игрите ви? + Steam може да покаже тези ваши игри като инсталирани: %1$s. Трябва да се рестартира, за да ги покаже. Рестартирайте сега или те ще бъдат добавени при следващото стартиране на Steam. + %1$s и още %2$d + Рестартиране сега + По-късно diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 03d2b8a894..17f4b320c8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -3281,4 +3281,9 @@ %1$s je připojen přes %2$s (%3$s Mb/s, asi %4$d MB/s). Port USB tohoto zařízení rychleji neumí, takže hry na něm se budou načítat pomalu. Interní úložiště nebo karta microSD může být rychlejší. Už nezobrazovat Zavřít + Restartovat Steam a přidat vaše hry? + Steam může tyto vaše hry zobrazit jako nainstalované: %1$s. Aby je ukázal, musí se restartovat. Restartujte teď, nebo se přidají při příštím spuštění Steamu. + %1$s a %2$d dalších + Restartovat teď + Později diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index bceadfc110..0525020d22 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -3211,4 +3211,9 @@ %1$s er tilsluttet via %2$s (%3$s Mbps, ca. %4$d MB/s). Denne enheds USB-port kan ikke køre hurtigere, så spil på den indlæses langsomt. Intern lagerplads eller et microSD-kort kan være hurtigere. Vis ikke igen Luk + Genstart Steam for at tilføje dine spil? + Steam kan vise disse spil, du ejer, som installerede: %1$s. Steam skal genstartes for at vise dem. Genstart nu, eller de bliver tilføjet næste gang Steam starter. + %1$s og %2$d mere + Genstart nu + Senere diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7a545a3e19..59e33c3045 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -3211,4 +3211,9 @@ %1$s ist über %2$s verbunden (%3$s Mbit/s, etwa %4$d MB/s). Der USB-Anschluss dieses Geräts kann nicht schneller, daher laden Spiele darauf langsam. Interner Speicher oder eine microSD-Karte können schneller sein. Nicht mehr anzeigen Schließen + Steam neu starten, um deine Spiele hinzuzufügen? + Steam kann diese Spiele, die du besitzt, als installiert anzeigen: %1$s. Dafür muss Steam neu starten. Starte jetzt neu, oder sie werden beim nächsten Start von Steam hinzugefügt. + %1$s und %2$d weitere + Jetzt neu starten + Später diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 710794bc56..2e788ac332 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -3211,4 +3211,9 @@ Η συσκευή %1$s συνδέεται μέσω %2$s (%3$s Mbps, περίπου %4$d MB/s). Η θύρα USB αυτής της συσκευής δεν υποστηρίζει μεγαλύτερη ταχύτητα, οπότε τα παιχνίδια θα φορτώνουν αργά. Ο εσωτερικός χώρος ή μια κάρτα microSD μπορεί να είναι ταχύτερα. Να μην εμφανιστεί ξανά Κλείσιμο + Επανεκκίνηση του Steam για να προστεθούν τα παιχνίδια σας; + Το Steam μπορεί να εμφανίσει αυτά τα παιχνίδια που έχετε ως εγκατεστημένα: %1$s. Πρέπει να γίνει επανεκκίνηση για να εμφανιστούν. Κάντε επανεκκίνηση τώρα ή θα προστεθούν την επόμενη φορά που θα ξεκινήσει το Steam. + %1$s και %2$d ακόμη + Επανεκκίνηση τώρα + Αργότερα diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7da86ab9cc..e691811dec 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -3248,4 +3248,9 @@ %1$s está conectado por %2$s (%3$s Mbps, unos %4$d MB/s). El puerto USB de este dispositivo no va más rápido, así que los juegos cargarán despacio. El almacenamiento interno o una microSD pueden ser más rápidos. No volver a mostrar Descartar + ¿Reiniciar Steam para añadir tus juegos? + Steam puede mostrar como instalados estos juegos que tienes: %1$s. Tiene que reiniciarse para mostrarlos. Reinicia ahora o se añadirán la próxima vez que se inicie Steam. + %1$s y %2$d más + Reiniciar ahora + Más tarde diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 589e5e6100..b1d4adf9f8 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -3211,4 +3211,9 @@ %1$s on yhdistetty %2$s-yhteydellä (%3$s Mbps, noin %4$d Mt/s). Tämän laitteen USB-portti ei ole nopeampi, joten pelit latautuvat hitaasti. Sisäinen tallennustila tai microSD-kortti voi olla nopeampi. Älä näytä uudelleen Sulje + Käynnistetäänkö Steam uudelleen pelien lisäämiseksi? + Steam voi näyttää nämä omistamasi pelit asennettuina: %1$s. Se täytyy käynnistää uudelleen, jotta ne näkyvät. Käynnistä uudelleen nyt, tai ne lisätään, kun Steam käynnistyy seuraavan kerran. + %1$s ja %2$d muuta + Käynnistä uudelleen nyt + Myöhemmin diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index c7c47b8903..f1f2f9ea74 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3248,4 +3248,9 @@ %1$s est connecté en %2$s (%3$s Mbit/s, environ %4$d Mo/s). Le port USB de cet appareil ne va pas plus vite, les jeux se chargeront donc lentement. Le stockage interne ou une carte microSD peut être plus rapide. Ne plus afficher Fermer + Redémarrer Steam pour ajouter vos jeux ? + Steam peut afficher comme installés ces jeux que vous possédez : %1$s. Il doit redémarrer pour les afficher. Redémarrez maintenant, ou ils seront ajoutés au prochain démarrage de Steam. + %1$s et %2$d de plus + Redémarrer maintenant + Plus tard diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0747e79b74..b31438a954 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -3211,4 +3211,9 @@ %1$s %2$s (%3$s Mbps, लगभग %4$d MB/s) से जुड़ा है। इस डिवाइस का USB पोर्ट इससे तेज़ नहीं चलता, इसलिए गेम धीरे लोड होंगे। आंतरिक स्टोरेज या microSD कार्ड तेज़ हो सकता है। फिर से न दिखाएँ बंद करें + अपने गेम जोड़ने के लिए Steam फिर से शुरू करें? + Steam आपके इन गेम को इंस्टॉल के रूप में दिखा सकता है: %1$s. इन्हें दिखाने के लिए इसे फिर से शुरू करना होगा। अभी फिर से शुरू करें, या ये अगली बार Steam शुरू होने पर जुड़ जाएंगे। + %1$s और %2$d और + अभी फिर से शुरू करें + बाद में diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8f00e2d8d3..adfa213d52 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -3211,4 +3211,9 @@ A(z) %1$s %2$s kapcsolaton csatlakozik (%3$s Mbps, kb. %4$d MB/s). Az eszköz USB-portja nem tud gyorsabb lenni, ezért a játékok lassan töltődnek be. A belső tárhely vagy egy microSD-kártya gyorsabb lehet. Ne jelenjen meg többé Bezárás + Újraindítod a Steamet a játékaid hozzáadásához? + A Steam telepítettként mutathatja ezeket a saját játékaidat: %1$s. Ehhez újra kell indulnia. Indítsd újra most, vagy a Steam következő indításakor kerülnek be. + %1$s és még %2$d + Újraindítás most + Később diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 6c37ebe154..51e82b7368 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -3200,4 +3200,9 @@ %1$s terhubung melalui %2$s (%3$s Mbps, sekitar %4$d MB/s). Port USB perangkat ini tidak bisa lebih cepat, jadi game akan dimuat lambat. Penyimpanan internal atau kartu microSD mungkin lebih cepat. Jangan tampilkan lagi Tutup + Mulai ulang Steam untuk menambahkan game Anda? + Steam dapat menampilkan game milik Anda ini sebagai terpasang: %1$s. Steam harus dimulai ulang untuk menampilkannya. Mulai ulang sekarang, atau game akan ditambahkan saat Steam dimulai berikutnya. + %1$s dan %2$d lainnya + Mulai ulang sekarang + Nanti diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 03e301ada4..df58eaf0bb 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3246,4 +3246,9 @@ %1$s è collegato tramite %2$s (%3$s Mbps, circa %4$d MB/s). La porta USB di questo dispositivo non va più veloce, quindi i giochi si caricheranno lentamente. La memoria interna o una microSD potrebbero essere più veloci. Non mostrare più Chiudi + Riavviare Steam per aggiungere i tuoi giochi? + Steam può mostrare come installati questi giochi che possiedi: %1$s. Deve riavviarsi per mostrarli. Riavvia ora, oppure verranno aggiunti al prossimo avvio di Steam. + %1$s e altri %2$d + Riavvia ora + Più tardi diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d24a33a5e1..0ebd814dfc 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -3187,4 +3187,9 @@ %1$s は %2$s(%3$s Mbps、約 %4$d MB/s)で接続されています。この端末の USB ポートはこれ以上速くならないため、ゲームの読み込みが遅くなります。内部ストレージや microSD カードの方が速い場合があります。 今後表示しない 閉じる + ゲームを追加するために Steam を再起動しますか? + 所有している次のゲームを Steam でインストール済みとして表示できます: %1$s。表示するには Steam の再起動が必要です。今すぐ再起動するか、次に Steam を起動したときに追加されます。 + %1$s ほか %2$d 件 + 今すぐ再起動 + 後で diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index b6699d5a3d..a1c13d54b2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3187,4 +3187,9 @@ %1$s이(가) %2$s(%3$s Mbps, 약 %4$d MB/s)로 연결되어 있습니다. 이 기기의 USB 포트는 더 빠르게 동작하지 않아 게임 로딩이 느립니다. 내부 저장소나 microSD 카드가 더 빠를 수 있습니다. 다시 표시 안 함 닫기 + 게임을 추가하려면 Steam을 다시 시작할까요? + 보유한 다음 게임을 Steam에서 설치됨으로 표시할 수 있습니다: %1$s. 표시하려면 Steam을 다시 시작해야 합니다. 지금 다시 시작하거나, 다음에 Steam을 시작할 때 추가됩니다. + %1$s 외 %2$d개 + 지금 다시 시작 + 나중에 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index bfac9486b5..078b7724e3 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -3185,4 +3185,9 @@ %1$s disambungkan melalui %2$s (%3$s Mbps, kira-kira %4$d MB/s). Port USB peranti ini tidak boleh lebih pantas, jadi permainan akan dimuatkan perlahan. Storan dalaman atau kad microSD mungkin lebih pantas. Jangan tunjukkan lagi Tutup + Mulakan semula Steam untuk menambah permainan anda? + Steam boleh menyenaraikan permainan milik anda ini sebagai dipasang: %1$s. Steam perlu dimulakan semula untuk menunjukkannya. Mulakan semula sekarang, atau ia akan ditambah apabila Steam dimulakan seterusnya. + %1$s dan %2$d lagi + Mulakan semula sekarang + Kemudian diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a60039957a..f58ba3c2a1 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -3211,4 +3211,9 @@ %1$s er koblet til via %2$s (%3$s Mbps, ca. %4$d MB/s). USB-porten på denne enheten kan ikke gå raskere, så spill lastes inn tregt. Intern lagring eller et microSD-kort kan være raskere. Ikke vis igjen Lukk + Starte Steam på nytt for å legge til spillene dine? + Steam kan vise disse spillene du eier som installert: %1$s. Steam må startes på nytt for å vise dem. Start på nytt nå, eller så legges de til neste gang Steam starter. + %1$s og %2$d til + Start på nytt nå + Senere diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 78714d0466..278d7e8e86 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3211,4 +3211,9 @@ %1$s is verbonden via %2$s (%3$s Mbps, ongeveer %4$d MB/s). De USB-poort van dit apparaat kan niet sneller, dus games laden traag. Interne opslag of een microSD-kaart kan sneller zijn. Niet meer tonen Sluiten + Steam opnieuw starten om je games toe te voegen? + Steam kan deze games die je bezit als geïnstalleerd tonen: %1$s. Steam moet opnieuw starten om ze te tonen. Start nu opnieuw, of ze worden toegevoegd de volgende keer dat Steam start. + %1$s en nog %2$d + Nu opnieuw starten + Later diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7c654de69c..61f6bae810 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -3284,4 +3284,9 @@ %1$s jest podłączony przez %2$s (%3$s Mb/s, około %4$d MB/s). Port USB tego urządzenia nie działa szybciej, więc gry będą wczytywać się wolno. Pamięć wewnętrzna lub karta microSD mogą być szybsze. Nie pokazuj ponownie Zamknij + Uruchomić ponownie Steam, aby dodać Twoje gry? + Steam może pokazać te posiadane gry jako zainstalowane: %1$s. Aby je pokazać, musi się uruchomić ponownie. Uruchom ponownie teraz albo zostaną dodane przy następnym uruchomieniu Steam. + %1$s i %2$d więcej + Uruchom ponownie teraz + Później diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index cdc2836202..edfb951b44 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -3246,4 +3246,9 @@ %1$s está ligado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste dispositivo não é mais rápida, por isso os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido. Não voltar a mostrar Ignorar + Reiniciar o Steam para adicionar os seus jogos? + O Steam pode mostrar estes jogos que tem como instalados: %1$s. Tem de reiniciar para os mostrar. Reinicie agora ou serão adicionados da próxima vez que o Steam iniciar. + %1$s e mais %2$d + Reiniciar agora + Mais tarde diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 16a34a0da4..9f1726d2bd 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -3246,4 +3246,9 @@ %1$s está conectado por %2$s (%3$s Mbps, cerca de %4$d MB/s). A porta USB deste aparelho não fica mais rápida, então os jogos vão carregar devagar. O armazenamento interno ou um cartão microSD pode ser mais rápido. Não mostrar novamente Dispensar + Reiniciar a Steam para adicionar seus jogos? + A Steam pode mostrar estes jogos que você tem como instalados: %1$s. Ela precisa reiniciar para mostrá-los. Reinicie agora ou eles serão adicionados na próxima vez que a Steam iniciar. + %1$s e mais %2$d + Reiniciar agora + Mais tarde diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 7c49b19788..c75540057d 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -3246,4 +3246,9 @@ %1$s este conectat prin %2$s (%3$s Mbps, aproximativ %4$d MB/s). Portul USB al acestui dispozitiv nu poate merge mai repede, așa că jocurile se vor încărca lent. Memoria internă sau un card microSD pot fi mai rapide. Nu mai afișa Închide + Repornești Steam pentru a adăuga jocurile tale? + Steam poate afișa ca instalate aceste jocuri pe care le deții: %1$s. Trebuie să repornească pentru a le afișa. Repornește acum sau vor fi adăugate la următoarea pornire a Steam. + %1$s și încă %2$d + Repornește acum + Mai târziu diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 0d33774812..636f297a7a 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3283,4 +3283,9 @@ %1$s подключён через %2$s (%3$s Мбит/с, около %4$d МБ/с). USB-порт этого устройства не работает быстрее, поэтому игры будут загружаться медленно. Внутренняя память или карта microSD могут быть быстрее. Больше не показывать Закрыть + Перезапустить Steam, чтобы добавить ваши игры? + Steam может показать эти ваши игры как установленные: %1$s. Для этого его нужно перезапустить. Перезапустите сейчас, или они будут добавлены при следующем запуске Steam. + %1$s и ещё %2$d + Перезапустить сейчас + Позже diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 5b334def6c..d9eab8b996 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -3211,4 +3211,9 @@ %1$s är ansluten via %2$s (%3$s Mbit/s, cirka %4$d MB/s). USB-porten på den här enheten kan inte gå snabbare, så spel läses in långsamt. Internt lagringsutrymme eller ett microSD-kort kan vara snabbare. Visa inte igen Stäng + Starta om Steam för att lägga till dina spel? + Steam kan visa de här spelen du äger som installerade: %1$s. Steam måste startas om för att visa dem. Starta om nu, annars läggs de till nästa gång Steam startar. + %1$s och %2$d till + Starta om nu + Senare diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 6787bb346f..1d82dc425c 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -3185,4 +3185,9 @@ %1$s เชื่อมต่อผ่าน %2$s (%3$s Mbps ประมาณ %4$d MB/s) พอร์ต USB ของอุปกรณ์นี้เร็วกว่านี้ไม่ได้ เกมจึงโหลดช้า ที่เก็บข้อมูลภายในหรือการ์ด microSD อาจเร็วกว่า ไม่ต้องแสดงอีก ปิด + รีสตาร์ต Steam เพื่อเพิ่มเกมของคุณหรือไม่ + Steam แสดงเกมที่คุณเป็นเจ้าของเหล่านี้ว่าติดตั้งแล้วได้: %1$s ต้องรีสตาร์ตเพื่อให้แสดง รีสตาร์ตเลย หรือเกมจะถูกเพิ่มเมื่อ Steam เริ่มครั้งถัดไป + %1$s และอีก %2$d เกม + รีสตาร์ตเลย + ภายหลัง diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 268e71eb55..d0954c0cf9 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -3213,4 +3213,9 @@ %1$s, %2$s üzerinden bağlı (%3$s Mbps, yaklaşık %4$d MB/sn). Bu cihazın USB bağlantı noktası daha hızlı çalışamıyor, bu yüzden oyunlar yavaş yüklenecek. Dahili depolama veya bir microSD kart daha hızlı olabilir. Bir daha gösterme Kapat + Oyunlarınızı eklemek için Steam yeniden başlatılsın mı? + Steam sahip olduğunuz bu oyunları yüklü olarak gösterebilir: %1$s. Bunları göstermek için yeniden başlaması gerekir. Şimdi yeniden başlatın ya da Steam bir sonraki açılışta onları ekleyecek. + %1$s ve %2$d tane daha + Şimdi yeniden başlat + Daha sonra diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d2ba5740ae..c4a1d85515 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -3281,4 +3281,9 @@ %1$s під’єднано через %2$s (%3$s Мбіт/с, близько %4$d МБ/с). USB-порт цього пристрою не працює швидше, тому ігри завантажуватимуться повільно. Внутрішня пам’ять або карта microSD можуть бути швидшими. Більше не показувати Закрити + Перезапустити Steam, щоб додати ваші ігри? + Steam може показати ці ваші ігри як встановлені: %1$s. Для цього його треба перезапустити. Перезапустіть зараз, або їх буде додано під час наступного запуску Steam. + %1$s і ще %2$d + Перезапустити зараз + Пізніше diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index b64b42a473..6a958face6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -3185,4 +3185,9 @@ %1$s đang kết nối qua %2$s (%3$s Mbps, khoảng %4$d MB/s). Cổng USB của thiết bị này không thể nhanh hơn, nên trò chơi sẽ tải chậm. Bộ nhớ trong hoặc thẻ microSD có thể nhanh hơn. Không hiển thị lại Đóng + Khởi động lại Steam để thêm trò chơi của bạn? + Steam có thể hiển thị các trò chơi bạn sở hữu này là đã cài đặt: %1$s. Steam cần khởi động lại để hiển thị chúng. Khởi động lại ngay, hoặc chúng sẽ được thêm vào lần tới Steam khởi động. + %1$s và %2$d trò chơi khác + Khởi động lại ngay + Để sau diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7454c3ad67..1643e453dd 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3193,4 +3193,9 @@ %1$s 通过 %2$s 连接(%3$s Mbps,约 %4$d MB/s)。此设备的 USB 接口无法更快,游戏加载会很慢。内部存储或 microSD 卡可能更快。 不再显示 关闭 + 重启 Steam 以添加你的游戏? + Steam 可以将你拥有的这些游戏显示为已安装:%1$s。需要重启 Steam 才能显示。现在重启,或在下次启动 Steam 时添加。 + %1$s 等另外 %2$d 款 + 立即重启 + 稍后 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 10b71c5c87..c7a9cfd669 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -3192,4 +3192,9 @@ %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。 不再顯示 關閉 + 重新啟動 Steam 以加入你的遊戲? + Steam 可將你擁有的這些遊戲顯示為已安裝:%1$s。需要重新啟動 Steam 才會顯示。立即重新啟動,或在下次啟動 Steam 時加入。 + %1$s 及另外 %2$d 款 + 立即重新啟動 + 稍後 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index e0bf783681..d8aba91922 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -3192,4 +3192,9 @@ %1$s 透過 %2$s 連接(%3$s Mbps,約 %4$d MB/s)。此裝置的 USB 連接埠無法更快,遊戲載入會很慢。內部儲存空間或 microSD 卡可能更快。 不再顯示 關閉 + 重新啟動 Steam 以加入你的遊戲? + Steam 可以將你擁有的這些遊戲顯示為已安裝:%1$s。需要重新啟動 Steam 才會顯示。立即重新啟動,或在下次啟動 Steam 時加入。 + %1$s 及另外 %2$d 款 + 立即重新啟動 + 稍後 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6c61118021..202ae96183 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3437,4 +3437,9 @@ %1$s is connected over %2$s (%3$s Mbps, about %4$d MB/s). This device\'s USB port can\'t go faster, so games on it will load slowly. Internal storage or a microSD card may be quicker. Don\'t show this again Dismiss + Restart Steam to add your games? + Steam can list these games you own as installed: %1$s. It has to restart to show them. Restart now, or they will be added the next time Steam starts. + %1$s and %2$d more + Restart now + Later diff --git a/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt new file mode 100644 index 0000000000..0ff861749b --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/SteamImportPromptTest.kt @@ -0,0 +1,46 @@ +package com.droiddeck.launcher.session + +import android.app.Application +import org.json.JSONObject +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config +import java.io.File + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [33], manifest = Config.NONE, application = Application::class) +class SteamImportPromptTest { + @get:Rule val temp = TemporaryFolder() + + private fun ask(root: File, text: String) = File(root, "root/.cache/droiddeck").apply { mkdirs() }.resolve("steam-import.json").writeText(text) + + @Test fun aRequestFromTheGuestIsRead() { + val root = temp.newFolder() + ask(root, """{"token":"7","games":["Absolum","","Hades"]}""") + assertEquals(SteamImportPrompt.Ask("7", listOf("Absolum", "Hades")), SteamImportPrompt.read(root)) + } + + @Test fun noRequestOrABrokenOneIsIgnored() { + val root = temp.newFolder() + assertNull(SteamImportPrompt.read(root)) + ask(root, "{") + assertNull(SteamImportPrompt.read(root)) + ask(root, """{"games":["Hades"]}""") + assertNull(SteamImportPrompt.read(root)) + } + + @Test fun theAnswerCarriesTheTokenAndTheChoice() { + val root = temp.newFolder() + for ((now, choice) in listOf(true to "now", false to "later")) { + SteamImportPrompt.answer(root, "9", now) + val json = JSONObject(File(root, "root/.cache/droiddeck/steam-import.answer").readText()) + assertEquals("9", json.getString("token")) + assertEquals(choice, json.getString("choice")) + } + } +} diff --git a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games index c710ff0acc..775980a0c5 100755 --- a/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games +++ b/tools/linuxfs/overlay/usr/local/bin/droiddeck-steam-games @@ -14,6 +14,7 @@ import urllib.parse import urllib.request STATE = ".droiddeck-games.json" +TRIED = ".droiddeck-import-tried.json" WINNATIVE = ".winnative-steam/steamapps" LIBRARY = "/mnt/droiddeck-sd" LEGACY_LIBRARY = "/mnt/bannerlator-sd" @@ -179,10 +180,44 @@ def request_restart(steam_root): stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=30) +def ask_restart(names, timeout=600, clock=None, sleep=None): + """The app asks whether to restart the client now; anything but "now" leaves the import to the next start.""" + clock, sleep = clock or time.monotonic, sleep or time.sleep + folder = Path(os.environ.get("HOME", "/root"), ".cache/droiddeck") + ask, answer = folder / "steam-import.json", folder / "steam-import.answer" + token = str(time.time_ns()) + answer.unlink(missing_ok=True) + save_json(ask, {"token": token, "games": names}) + try: + deadline = clock() + timeout + while clock() < deadline: + reply = read_json(answer, None) + if isinstance(reply, dict) and reply.get("token") == token: + return reply.get("choice") == "now" + sleep(1) + return False + finally: + ask.unlink(missing_ok=True) + answer.unlink(missing_ok=True) + + def unimported(steam_root, snapshot, candidates): - routes = read_json(Path(steam_root) / "userdata" / snapshot["account"] / "config/.droiddeck-routes.json", {}) + config = Path(steam_root) / "userdata" / snapshot["account"] / "config" + routes = read_json(config / ".droiddeck-routes.json", {}) routed = set(routes.values()) if isinstance(routes, dict) else set() - return sorted({appid for appid in candidates.values() if snapshot["owned"].get(str(appid)) is True} - routed) + tried = read_json(config / TRIED, []) + tried = {appid for appid in tried if isinstance(appid, int)} if isinstance(tried, list) else set() + owned = {appid for appid in candidates.values() if snapshot["owned"].get(str(appid)) is True} + if tried - routed != tried: + save_json(config / TRIED, sorted(tried - routed)) + return sorted(owned - routed - tried) + + +def remember_tried(steam_root, account, appids): + config = Path(steam_root) / "userdata" / account / "config" + tried = read_json(config / TRIED, []) + tried = {appid for appid in tried if isinstance(appid, int)} if isinstance(tried, list) else set() + save_json(config / TRIED, sorted(tried | set(appids))) def watch(steam_root, listing): @@ -193,7 +228,7 @@ def watch(steam_root, listing): next_lookup = 0 last_status = None probed, next_probe, failures = None, 0, 0 - pending, requested = [], [] + pending, requested, account = [], [], None while True: now = time.monotonic() for game in games: @@ -233,6 +268,7 @@ def watch(steam_root, listing): snapshot["sources"] = sources save_json(Path(steam_root) / "userdata" / snapshot["account"] / "config" / STATE, snapshot) pending = unimported(steam_root, snapshot, candidates) + account = snapshot["account"] status = "matched %d/%d games; %d owned" % (len(candidates), len(games), sum(snapshot["owned"].values())) except (OSError, ValueError, KeyError, StopIteration, subprocess.TimeoutExpired) as error: status = "ownership check unavailable: " + str(error) @@ -242,9 +278,14 @@ def watch(steam_root, listing): status = last_status if pending and pending != requested and not game_running() and downloads_idle(steam_root): requested = pending - print("droiddeck-steam-games: restarting the client once to import %s" % pending, flush=True) + names = sorted({game["name"] for game in games if candidates.get(game["folder"]) in pending}) try: - request_restart(steam_root) + remember_tried(steam_root, account, pending) + if ask_restart(names) and not game_running() and downloads_idle(steam_root): + print("droiddeck-steam-games: restarting the client once to import %s" % pending, flush=True) + request_restart(steam_root) + else: + print("droiddeck-steam-games: %s will be imported the next time the client starts" % pending, flush=True) except (OSError, subprocess.TimeoutExpired) as error: print("droiddeck-steam-games: restart unavailable: %s" % error, flush=True) if status != last_status: @@ -436,6 +477,7 @@ def route(steam_root, acct, games): if seed_install(steam_root, game, appid): routes[str(game["appid"])] = appid continue + print(f"droiddeck-steam-games: {game.get('name', appid)} stays a shortcut this session: it could not be linked as Steam app {appid}") except OSError as error: print(f"droiddeck-steam-games: import unavailable ({error})") elif isinstance(appid, int) and 0 < appid < 0x80000000 and seeded(steamapps, game, appid): diff --git a/tools/tests/test_steam_games.py b/tools/tests/test_steam_games.py index 7ad6e53003..c09d751a95 100644 --- a/tools/tests/test_steam_games.py +++ b/tools/tests/test_steam_games.py @@ -113,9 +113,11 @@ class ImportsTest(unittest.TestCase): listing = self.root / 'games.json' listing.write_text(json.dumps([self.game])) from unittest.mock import Mock + idle = imports.downloads_idle result = Mock(returncode=0, stdout='DROIDDECK_OWNERSHIP=' + json.dumps(dict(account='123', owned={'42': True}))) with patch.object(imports, 'identify', side_effect=[None, 42]) as identify, \ patch.object(imports, 'request_restart'), \ + patch.object(imports, 'ask_restart', return_value=True), \ patch.object(imports, 'time', Mock(monotonic=Mock(side_effect=[0, 301]), sleep=Mock(side_effect=[None, RuntimeError('stop')]))), \ patch.object(imports.subprocess, 'run', return_value=result), \ @@ -126,7 +128,7 @@ class ImportsTest(unittest.TestCase): snapshot = imports.read_json(self.acct / 'config' / imports.STATE, {}) self.assertTrue(snapshot['owned']['42']) - def run_watch(self, beats, routes=None, busy=False): + def run_watch(self, beats, routes=None, busy=False, answer=True, started=False): listing = self.root / 'games.json' listing.write_text(json.dumps([self.game])) if routes is not None: @@ -134,21 +136,64 @@ class ImportsTest(unittest.TestCase): if busy: (self.steam / 'steamapps/downloading/7').mkdir(parents=True) from unittest.mock import Mock + idle = imports.downloads_idle result = Mock(returncode=0, stdout='DROIDDECK_OWNERSHIP=' + json.dumps(dict(account='123', owned={'42': True}))) with patch.object(imports, 'identify', return_value=42), \ patch.object(imports, 'game_running', return_value=False), \ patch.object(imports, 'request_restart') as restart, \ + patch.object(imports, 'ask_restart', return_value=answer) as asked, \ + patch.object(imports, 'downloads_idle', side_effect=lambda root: idle(root) and not (started and asked.called)), \ patch.object(imports, 'time', Mock(monotonic=Mock(side_effect=list(range(0, 30 * beats, 30))), sleep=Mock(side_effect=[None] * (beats - 1) + [RuntimeError('stop')]))), \ patch.object(imports.subprocess, 'run', return_value=result), \ patch('builtins.print'): with self.assertRaisesRegex(RuntimeError, 'stop'): imports.watch(self.steam, listing) + self.asked = asked return restart def test_newly_owned_game_restarts_the_client_once(self): self.assertEqual(1, self.run_watch(3).call_count) + def test_an_import_that_did_not_take_restarts_only_once_across_sessions(self): + self.assertEqual(1, self.run_watch(3).call_count) + self.assertEqual(0, self.run_watch(3).call_count) + self.assertEqual([42], imports.read_json(self.acct / 'config' / imports.TRIED, None)) + + def test_later_skips_the_restart_and_does_not_ask_again(self): + self.assertEqual(0, self.run_watch(3, answer=False).call_count) + self.assertEqual([['Example']], [c.args[0] for c in self.asked.call_args_list]) + self.assertEqual(0, self.run_watch(3).call_count) + self.assertEqual(0, self.asked.call_count) + + def test_a_download_started_while_asking_leaves_the_import_for_the_next_start(self): + self.assertEqual(0, self.run_watch(3, started=True).call_count) + self.assertEqual(1, self.asked.call_count) + + def test_the_app_answers_the_restart_question(self): + home = self.root / 'home' + folder = home / '.cache/droiddeck' + replies = [] + def sleep(_): + ask = json.loads((folder / 'steam-import.json').read_text()) + replies.append(ask['games']) + (folder / 'steam-import.answer').write_text(json.dumps(dict(token=ask['token'], choice=choice))) + for choice, expected in (('now', True), ('later', False)): + with patch.dict(os.environ, HOME=str(home)): + self.assertEqual(expected, imports.ask_restart(['Example'], clock=iter(range(100)).__next__, sleep=sleep)) + self.assertFalse((folder / 'steam-import.json').exists()) + self.assertFalse((folder / 'steam-import.answer').exists()) + self.assertEqual([['Example'], ['Example']], replies) + + def test_no_answer_means_later(self): + with patch.dict(os.environ, HOME=str(self.root / 'home')): + self.assertFalse(imports.ask_restart(['Example'], timeout=5, clock=iter(range(100)).__next__, sleep=lambda _: None)) + + def test_a_tried_import_that_took_is_forgotten(self): + imports.save_json(self.acct / 'config' / imports.TRIED, [42]) + self.assertEqual(0, self.run_watch(2, routes={'1': 42}).call_count) + self.assertEqual([], imports.read_json(self.acct / 'config' / imports.TRIED, None)) + def test_imported_game_does_not_restart_the_client(self): self.assertEqual(0, self.run_watch(2, routes={'1': 42}).call_count) diff --git a/tools/tests/test_steam_x64_signin.py b/tools/tests/test_steam_x64_signin.py index c294108e8c..ea761c68c8 100644 --- a/tools/tests/test_steam_x64_signin.py +++ b/tools/tests/test_steam_x64_signin.py @@ -39,12 +39,16 @@ class X64SignInTest(unittest.TestCase): self.write(self.x64 / 'config/loginusers.vdf', '"users"\n{\n}\n') self.write(self.x64 / 'config/config.vdf', CONFIG % '') self.write(self.home / '.droiddeck-x64/.steam/registry.vdf', REGISTRY % '') + self.bin = self.home / 'bin' + self.bin.mkdir() + (self.bin / 'pgrep').write_text('#!/bin/sh\nexit 1\n') + (self.bin / 'pgrep').chmod(0o755) def write(self, path, text): path.write_text(text) def sync(self): - env = dict(os.environ, HOME=str(self.home)) + env = dict(os.environ, HOME=str(self.home), PATH='%s:%s' % (self.bin, os.environ['PATH'])) env.pop('XDG_DATA_HOME', None) env.pop('BL_X64_HOME', None) return subprocess.run(['bash', str(SCRIPT), '--sync-login'], env=env, capture_output=True, text=True, check=True)