From 203d5a9bc3f1e09d75bd53f28daa4b1e76566ea0 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Wed, 15 Nov 2023 12:19:18 +0200 Subject: [PATCH] feat(ui): added "updating permissions" installation step --- assets/locales/de/main.ftl | 1 + assets/locales/en/main.ftl | 1 + assets/locales/es/main.ftl | 1 + assets/locales/fr/main.ftl | 1 + assets/locales/hu/main.ftl | 1 + assets/locales/id/main.ftl | 3 ++- assets/locales/it/main.ftl | 1 + assets/locales/ja/main.ftl | 1 + assets/locales/ko/main.ftl | 1 + assets/locales/nl/main.ftl | 1 + assets/locales/pl/main.ftl | 1 + assets/locales/pt/main.ftl | 1 + assets/locales/ru/main.ftl | 1 + assets/locales/sv/main.ftl | 1 + assets/locales/tr/main.ftl | 1 + assets/locales/vi/main.ftl | 1 + assets/locales/zh-cn/main.ftl | 1 + src/ui/components/progress_bar.rs | 11 +++++++---- src/ui/main/mod.rs | 6 +++--- 19 files changed, 28 insertions(+), 8 deletions(-) diff --git a/assets/locales/de/main.ftl b/assets/locales/de/main.ftl index d8e8dfc..4a9bb43 100644 --- a/assets/locales/de/main.ftl +++ b/assets/locales/de/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Launcher status wird geladen: Verifizierung des checking-free-space = Überprüfe Freien Speicherplatz downloading = Lade Herunter +updating-permissions = Updating permissions unpacking = Entpacken verifying-files = Verifiziere Dateien repairing-files = Repariere Dateien diff --git a/assets/locales/en/main.ftl b/assets/locales/en/main.ftl index f9ebbc4..dcd5f7f 100644 --- a/assets/locales/en/main.ftl +++ b/assets/locales/en/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Loading launcher state: verifying installed patc checking-free-space = Checking free space downloading = Downloading +updating-permissions = Updating permissions unpacking = Unpacking verifying-files = Verifying files repairing-files = Repairing files diff --git a/assets/locales/es/main.ftl b/assets/locales/es/main.ftl index 97d1e39..9741018 100644 --- a/assets/locales/es/main.ftl +++ b/assets/locales/es/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Cargando estado del launcher: Verificando parche checking-free-space = Comprobando espacio libre downloading = Descargando +updating-permissions = Updating permissions unpacking = Descomprimiendo verifying-files = Verificación de archivos repairing-files = Reparación de archivos diff --git a/assets/locales/fr/main.ftl b/assets/locales/fr/main.ftl index cd0d800..50b4d57 100644 --- a/assets/locales/fr/main.ftl +++ b/assets/locales/fr/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Chargement de l'état du launcher : vérificati checking-free-space = Vérification de l'espace disque disponible downloading = Téléchargement +updating-permissions = Updating permissions unpacking = Décompression verifying-files = Vérification des fichiers repairing-files = Réparation des fichiers diff --git a/assets/locales/hu/main.ftl b/assets/locales/hu/main.ftl index 24fd039..85babcd 100644 --- a/assets/locales/hu/main.ftl +++ b/assets/locales/hu/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Launcher állapot betöltése: telepített patch checking-free-space = Szabad hely ellenőrzése downloading = Letöltés +updating-permissions = Updating permissions unpacking = Kicsomagolás verifying-files = Fájlok ellenőrzése repairing-files = Fájlok javítása diff --git a/assets/locales/id/main.ftl b/assets/locales/id/main.ftl index af68365..2410aba 100644 --- a/assets/locales/id/main.ftl +++ b/assets/locales/id/main.ftl @@ -48,7 +48,8 @@ loading-launcher-state--patch = Memuat keadaan launcher: memverifikasi patch yan checking-free-space = Mengecek penyimpanan kosong -downloading = Mengunduh +downloading = Mengunduh +updating-permissions = Updating permissions unpacking = Membongkar verifying-files = Memverifikasi file repairing-files = Memperbaiki file diff --git a/assets/locales/it/main.ftl b/assets/locales/it/main.ftl index f0ae89c..a0b3657 100644 --- a/assets/locales/it/main.ftl +++ b/assets/locales/it/main.ftl @@ -51,6 +51,7 @@ loading-launcher-state--patch = Caricamento dello stato del launcher: verifica d checking-free-space = Controllo dello spazio disponibile in corso downloading = Scaricamento in corso +updating-permissions = Updating permissions unpacking = Unpacking in corso verifying-files = Verifica dei file in corso repairing-files = Riparazione dei file in corso diff --git a/assets/locales/ja/main.ftl b/assets/locales/ja/main.ftl index 44cddda..a5878e0 100644 --- a/assets/locales/ja/main.ftl +++ b/assets/locales/ja/main.ftl @@ -50,6 +50,7 @@ loading-launcher-state--patch = ランチャーの状態を読み込み中 イ checking-free-space = 空き容量を確認しています downloading = ダウンロード中 +updating-permissions = Updating permissions unpacking = 展開 verifying-files = ファイルの整合性を確認中 repairing-files = ファイルを修正中 diff --git a/assets/locales/ko/main.ftl b/assets/locales/ko/main.ftl index 4061c22..f73b555 100644 --- a/assets/locales/ko/main.ftl +++ b/assets/locales/ko/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = 런처 상태 로드 중: 설치된 패치 확 checking-free-space = 여유 공간 확인 중 downloading = 다운로드 중 +updating-permissions = Updating permissions unpacking = 압축 해제 중 verifying-files = 파일 검증 중 repairing-files = 파일 복구 중 diff --git a/assets/locales/nl/main.ftl b/assets/locales/nl/main.ftl index 82affee..d97277f 100644 --- a/assets/locales/nl/main.ftl +++ b/assets/locales/nl/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Laadstatus van de launcher: geïnstalleerde patc checking-free-space = Vrije ruimte controleren downloading = Downloaden +updating-permissions = Updating permissions unpacking = Uitpakken verifying-files = Bestanden verifiëren repairing-files = Bestanden repareren diff --git a/assets/locales/pl/main.ftl b/assets/locales/pl/main.ftl index ee0c788..4a39582 100644 --- a/assets/locales/pl/main.ftl +++ b/assets/locales/pl/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Ładowanie stanu launchera: weryfikowanie zainst checking-free-space = Sprawdzanie dostępnej przestrzeni downloading = Pobieranie +updating-permissions = Updating permissions unpacking = Rozpakowywanie verifying-files = Weryfikacja plików repairing-files = Naprawianie plików diff --git a/assets/locales/pt/main.ftl b/assets/locales/pt/main.ftl index 414bdc6..fc3ada2 100644 --- a/assets/locales/pt/main.ftl +++ b/assets/locales/pt/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Loading launcher state: verificando patch instal checking-free-space = Checando espaço livre downloading = Baixando +updating-permissions = Updating permissions unpacking = Extraindo verifying-files = Verificando arquivos repairing-files = Reparando arquivos diff --git a/assets/locales/ru/main.ftl b/assets/locales/ru/main.ftl index f4fef2b..e288c4d 100644 --- a/assets/locales/ru/main.ftl +++ b/assets/locales/ru/main.ftl @@ -56,6 +56,7 @@ loading-launcher-state--patch = Загрузка статуса лаунчера checking-free-space = Проверка свободного места downloading = Загрузка +updating-permissions = Обновление привелегий unpacking = Распаковка verifying-files = Проверка файлов repairing-files = Починка файлов diff --git a/assets/locales/sv/main.ftl b/assets/locales/sv/main.ftl index 08eb991..658c54b 100644 --- a/assets/locales/sv/main.ftl +++ b/assets/locales/sv/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Laddar starthanterarens tillstånd: verifierar i checking-free-space = Kontrollerar ledigt utrymme downloading = Laddar ner +updating-permissions = Updating permissions unpacking = Packar upp verifying-files = Verifierar filer repairing-files = Reparerar filer diff --git a/assets/locales/tr/main.ftl b/assets/locales/tr/main.ftl index 2237005..6bdedd1 100644 --- a/assets/locales/tr/main.ftl +++ b/assets/locales/tr/main.ftl @@ -50,6 +50,7 @@ loading-launcher-state--patch = Loading launcher state: indirilmiş yamanın dur checking-free-space = Boş alan kontrol ediliyor downloading = İndiriliyor +updating-permissions = Updating permissions unpacking = Paketten çıkartılıyor verifying-files = Dosyalar Doğrulanıyor repairing-files = Dosyalar tamir ediliyor diff --git a/assets/locales/vi/main.ftl b/assets/locales/vi/main.ftl index c86e395..541880d 100644 --- a/assets/locales/vi/main.ftl +++ b/assets/locales/vi/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = Đang tải trạng thái launcher: xác minh b checking-free-space = Kiểm tra dung lượng trống downloading = Đang tải xuống +updating-permissions = Updating permissions unpacking = Đang giải nén verifying-files = Đang xác minh tập tin repairing-files = Sửa chữa tập tin diff --git a/assets/locales/zh-cn/main.ftl b/assets/locales/zh-cn/main.ftl index 68e928d..6ee1dc0 100644 --- a/assets/locales/zh-cn/main.ftl +++ b/assets/locales/zh-cn/main.ftl @@ -42,6 +42,7 @@ loading-launcher-state--patch = 正在计算启动器状态: 验证已安装补 checking-free-space = 正在检查剩余空间 downloading = 正在下载 +updating-permissions = Updating permissions unpacking = 正在解压缩 verifying-files = 正在检验文件 repairing-files = 正在修复文件 diff --git a/src/ui/components/progress_bar.rs b/src/ui/components/progress_bar.rs index e041094..6e63845 100644 --- a/src/ui/components/progress_bar.rs +++ b/src/ui/components/progress_bar.rs @@ -133,8 +133,9 @@ impl SimpleAsyncComponent for ProgressBar { DiffUpdate::CheckingFreeSpace(_) | DiffUpdate::InstallerUpdate(InstallerUpdate::CheckingFreeSpace(_)) => self.caption = Some(tr!("checking-free-space")), - DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingStarted(_)) => self.caption = Some(tr!("downloading")), - DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingStarted(_)) => self.caption = Some(tr!("unpacking")), + DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingStarted(_)) => self.caption = Some(tr!("downloading")), + DiffUpdate::InstallerUpdate(InstallerUpdate::UpdatingPermissionsStarted(_)) => self.caption = Some(tr!("updating-permissions")), + DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingStarted(_)) => self.caption = Some(tr!("unpacking")), DiffUpdate::ApplyingHdiffStarted => { self.caption = Some(tr!("applying-hdiff")); @@ -149,6 +150,7 @@ impl SimpleAsyncComponent for ProgressBar { }, DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingProgress(curr, total)) | + DiffUpdate::InstallerUpdate(InstallerUpdate::UpdatingPermissions(curr, total)) | DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingProgress(curr, total)) | DiffUpdate::ApplyingHdiffProgress(curr, total) | DiffUpdate::RemovingOutdatedProgress(curr, total) => { @@ -160,8 +162,9 @@ impl SimpleAsyncComponent for ProgressBar { )); } - DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingFinished) => tracing::info!("Downloading finished"), - DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingFinished) => tracing::info!("Unpacking finished"), + DiffUpdate::InstallerUpdate(InstallerUpdate::DownloadingFinished) => tracing::info!("Downloading finished"), + DiffUpdate::InstallerUpdate(InstallerUpdate::UpdatingPermissionsFinished) => tracing::info!("Updating permissions finished"), + DiffUpdate::InstallerUpdate(InstallerUpdate::UnpackingFinished) => tracing::info!("Unpacking finished"), DiffUpdate::ApplyingHdiffFinished => tracing::info!("Applying hdiffs finished"), DiffUpdate::RemovingOutdatedFinished => tracing::info!("Removing outdated files finished"), diff --git a/src/ui/main/mod.rs b/src/ui/main/mod.rs index 879e152..59f3380 100644 --- a/src/ui/main/mod.rs +++ b/src/ui/main/mod.rs @@ -969,10 +969,10 @@ impl SimpleComponent for App { if let Some(state) = state { match state { - LauncherState::VoiceUpdateAvailable(_) | - LauncherState::VoiceNotInstalled(_) | LauncherState::GameUpdateAvailable(_) | - LauncherState::GameNotInstalled(_) if perform_on_download_needed => { + LauncherState::GameNotInstalled(_) | + LauncherState::VoiceUpdateAvailable(_) | + LauncherState::VoiceNotInstalled(_) if perform_on_download_needed => { sender.input(AppMsg::PerformAction); }