anime-game-testing/the-honkers-railway-launcher
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix: fixed merging issues

Browse source
This commit is contained in:
Nikita Podvirnyi 2024-08-02 11:56:19 +02:00
parent 898388e1b9
commit 008b8ce1b5
No known key found for this signature in database
GPG key ID: 859D416E5142AFF3
6 changed files with 61 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -82,8 +82,8 @@ dependencies = [
[[package]] [[package]]
name = "anime-launcher-sdk" name = "anime-launcher-sdk"
version = "1.17.0" version = "1.17.1"
source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.17.0#a17a0824344d24bf02de00aee71967b028c176bb" source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.17.1#017d0d164f7d8b16043d42a8be7187c21951faf0"
dependencies = [ dependencies = [
"anime-game-core", "anime-game-core",
"anyhow", "anyhow",

2
Cargo.toml
View file

@ -19,7 +19,7 @@ glib-build-tools = "0.20"
[dependencies.anime-launcher-sdk] [dependencies.anime-launcher-sdk]
git = "https://github.com/an-anime-team/anime-launcher-sdk" git = "https://github.com/an-anime-team/anime-launcher-sdk"
tag = "1.17.0" tag = "1.17.1"
features = ["all", "star-rail", "star-rail-patch"] features = ["all", "star-rail", "star-rail-patch"]
# path = "../anime-launcher-sdk" # ! for dev purposes only # path = "../anime-launcher-sdk" # ! for dev purposes only

2
src/ui/first_run/default_paths.rs
View file

@ -353,7 +353,7 @@ impl SimpleAsyncComponent for DefaultPathsApp {
DefaultPathsAppMsg::Continue => { DefaultPathsAppMsg::Continue => {
match self.update_config() { match self.update_config() {
Ok(_) => { Ok(_) => {
sender.output(Self::Output::ScrollToSelectVoiceovers); sender.output(Self::Output::ScrollToDownloadComponents);
} }
Err(err) => { Err(err) => {

51
src/ui/main/mod.rs
View file

@ -990,31 +990,36 @@ impl SimpleComponent for App {
// Update initial patch status // Update initial patch status
tasks.push(std::thread::spawn(clone!(@strong sender => move || { tasks.push(std::thread::spawn(clone!(
// Get main patch status #[strong]
sender.input(AppMsg::SetMainPatch(match jadeite::get_metadata() { sender,
Ok(metadata) => {
let status = GAME.get_version()
.map(|version| metadata.games.hsr.global.get_status(version))
.unwrap_or(metadata.games.hsr.global.status);
Some((metadata.jadeite.version, status)) move || {
} // Get main patch status
sender.input(AppMsg::SetMainPatch(match jadeite::get_metadata() {
Ok(metadata) => {
let status = GAME.get_version()
.map(|version| metadata.games.hsr.global.get_status(version))
.unwrap_or(metadata.games.hsr.global.status);
Err(err) => { Some((metadata.jadeite.version, status))
tracing::error!("Failed to fetch patch metadata: {err}"); }
sender.input(AppMsg::Toast { Err(err) => {
title: tr!("patch-info-fetching-error"), tracing::error!("Failed to fetch patch metadata: {err}");
description: Some(err.to_string())
});
None sender.input(AppMsg::Toast {
} title: tr!("patch-info-fetching-error"),
})); description: Some(err.to_string())
});
tracing::info!("Updated patch status"); None
}))); }
}));
tracing::info!("Updated patch status");
}
)));
// Update initial game version status // Update initial game version status
@ -1089,10 +1094,10 @@ impl SimpleComponent for App {
"locale" = locale.to_name() "locale" = locale.to_name()
}))))); })))));
} }
}
StateUpdating::Patch => { StateUpdating::Patch => {
sender.input(AppMsg::SetLoadingStatus(Some(Some(tr!("loading-launcher-state--patch"))))); sender.input(AppMsg::SetLoadingStatus(Some(Some(tr!("loading-launcher-state--patch")))));
}
} }
} }
} }

49
src/ui/main/update_patch.rs
View file

@ -17,33 +17,38 @@ pub fn update_patch(sender: ComponentSender<App>, progress_bar_input: Sender<Pro
std::thread::spawn(move || { std::thread::spawn(move || {
let result = jadeite::get_latest() let result = jadeite::get_latest()
.and_then(|patch| patch.install(config.patch.path, clone!(@strong sender => move |state| { .and_then(|patch| patch.install(config.patch.path, clone!(
match &state { #[strong]
InstallerUpdate::DownloadingError(err) => { sender,
tracing::error!("Downloading failed: {err}");
sender.input(AppMsg::Toast { move |state| {
title: tr!("downloading-failed"), match &state {
description: Some(err.to_string()) InstallerUpdate::DownloadingError(err) => {
}); 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())
});
}
_ => ()
} }
InstallerUpdate::UnpackingError(err) => { #[allow(unused_must_use)] {
tracing::error!("Unpacking failed: {err}"); progress_bar_input.send(ProgressBarMsg::UpdateFromState(state.into()));
sender.input(AppMsg::Toast {
title: tr!("unpacking-failed"),
description: Some(err.clone())
});
} }
_ => ()
} }
)));
#[allow(unused_must_use)] {
progress_bar_input.send(ProgressBarMsg::UpdateFromState(state.into()));
}
})));
if let Err(err) = result { if let Err(err) = result {
tracing::error!("Failed to download latest patch version"); tracing::error!("Failed to download latest patch version");

2
src/ui/preferences/general/mod.rs
View file

@ -22,6 +22,8 @@ pub mod components;
use components::*; use components::*;
use crate::ui::preferences::main::PreferencesAppMsg;
use crate::i18n::*; use crate::i18n::*;
use crate::*; use crate::*;