From b1b3455f8e8b77f4768af2af396a4d741bd4d4b6 Mon Sep 17 00:00:00 2001 From: Observer KRypt0n_ Date: Sun, 5 Mar 2023 22:43:33 +0200 Subject: [PATCH] feat: updated core library --- CHANGELOG.md | 1 + Cargo.lock | 7 ++++--- anime-launcher-sdk | 2 +- src/background.rs | 2 -- src/ui/first_run/download_components.rs | 4 ---- src/ui/main.rs | 20 +++++--------------- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07dc1b2..575ca7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Forced `format_lang` to return regions for language codes +- Fixed titlebar behavior on some DEs ### Changed diff --git a/Cargo.lock b/Cargo.lock index 8f9e11a..d2f5e5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,7 +31,7 @@ dependencies = [ [[package]] name = "anime-game-core" -version = "1.3.6" +version = "1.3.7" dependencies = [ "anyhow", "bzip2", @@ -46,6 +46,7 @@ dependencies = [ "serde_json", "sysinfo", "tar", + "thiserror", "tracing", "xz", "zip", @@ -863,9 +864,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" diff --git a/anime-launcher-sdk b/anime-launcher-sdk index ca8d649..9d6aeff 160000 --- a/anime-launcher-sdk +++ b/anime-launcher-sdk @@ -1 +1 @@ -Subproject commit ca8d64906a8c8e21edb512552bbd89460ce37836 +Subproject commit 9d6aeff5265999f724ff6caf288007a0756f1415 diff --git a/src/background.rs b/src/background.rs index 6562c46..5c334b8 100644 --- a/src/background.rs +++ b/src/background.rs @@ -61,8 +61,6 @@ pub fn download_background() -> anyhow::Result<()> { downloader.continue_downloading = false; if let Err(err) = downloader.download_to(crate::BACKGROUND_FILE.as_path(), |_, _| {}) { - let err: std::io::Error = err.into(); - anyhow::bail!(err); } diff --git a/src/ui/first_run/download_components.rs b/src/ui/first_run/download_components.rs index 16246ce..5c0954d 100644 --- a/src/ui/first_run/download_components.rs +++ b/src/ui/first_run/download_components.rs @@ -312,8 +312,6 @@ impl SimpleAsyncComponent for DownloadComponentsApp { installer.install(&config.game.wine.builds, move |update| { match &update { InstallerUpdate::DownloadingError(err) => { - let err: std::io::Error = err.clone().into(); - tracing::error!("Failed to download wine: {err}"); sender.output(Self::Output::Toast { @@ -427,8 +425,6 @@ impl SimpleAsyncComponent for DownloadComponentsApp { installer.install(&config.game.dxvk.builds, move |update| { match &update { InstallerUpdate::DownloadingError(err) => { - let err: std::io::Error = err.clone().into(); - tracing::error!("Failed to download dxvk: {err}"); sender.output(Self::Output::Toast { diff --git a/src/ui/main.rs b/src/ui/main.rs index 73eabab..8e5e20c 100644 --- a/src/ui/main.rs +++ b/src/ui/main.rs @@ -891,8 +891,6 @@ impl SimpleComponent for App { tracing::debug!("Repairing: {}", file.path.to_string_lossy()); if let Err(err) = file.repair(&config.game.path) { - let err: std::io::Error = err.into(); - sender.input(AppMsg::Toast { title: tr("game-file-repairing-error"), description: Some(err.to_string()) @@ -943,8 +941,6 @@ impl SimpleComponent for App { })); if let Err(err) = result { - let err: std::io::Error = err.into(); - sender.input(AppMsg::Toast { title: tr("downloading-failed"), description: Some(err.to_string()) @@ -1094,28 +1090,26 @@ impl SimpleComponent for App { installer.install(&config.game.wine.builds, clone!(@strong sender => move |state| { match &state { InstallerUpdate::DownloadingError(err) => { - let err: std::io::Error = err.clone().into(); - tracing::error!("Downloading failed: {err}"); - + sender.input(AppMsg::Toast { title: tr("downloading-failed"), description: Some(err.to_string()) }); } - + InstallerUpdate::UnpackingError(err) => { tracing::error!("Unpacking failed: {err}"); - + sender.input(AppMsg::Toast { title: tr("unpacking-failed"), description: Some(err.clone()) }); } - + _ => () } - + progress_bar_input.send(ProgressBarMsg::UpdateFromState(state)); })); @@ -1203,8 +1197,6 @@ impl SimpleComponent for App { let result = diff.install_to_by(config.game.path, config.launcher.temp, clone!(@strong sender => move |state| { match &state { InstallerUpdate::DownloadingError(err) => { - let err: std::io::Error = err.clone().into(); - tracing::error!("Downloading failed: {err}"); sender.input(AppMsg::Toast { @@ -1229,8 +1221,6 @@ impl SimpleComponent for App { })); if let Err(err) = result { - let err: std::io::Error = err.into(); - tracing::error!("Downloading failed: {err}"); sender.input(AppMsg::Toast {