Merge pull request #4 from mkrsym1/metadata-fallback

Support Jadeite metadata mirrors
This commit is contained in:
Observer KRypt0n_ 2023-07-18 18:39:04 +02:00 committed by GitHub
commit eebebb04c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions

View file

@ -80,7 +80,10 @@ impl LauncherState {
return Ok(Self::PatchNotInstalled);
}
if jadeite::get_latest()?.version > jadeite::get_version(params.patch_folder)? {
// Fetch patch metadata
let metadata = jadeite::get_metadata()?;
if metadata.jadeite.version > jadeite::get_version(params.patch_folder)? {
return Ok(Self::PatchUpdateAvailable);
}
@ -102,7 +105,7 @@ impl LauncherState {
return Ok(Self::TelemetryNotDisabled);
}
match jadeite::get_metadata()?.hi3rd.global.get_status(version) {
match metadata.games.hi3rd.global.get_status(version) {
JadeitePatchStatusVariant::Verified => Ok(Self::Launch),
JadeitePatchStatusVariant::Unverified => Ok(Self::PatchNotVerified),
JadeitePatchStatusVariant::Broken => Ok(Self::PatchBroken),

View file

@ -82,7 +82,10 @@ impl LauncherState {
return Ok(Self::PatchNotInstalled);
}
if jadeite::get_latest()?.version > jadeite::get_version(params.patch_folder)? {
// Fetch patch metadata
let metadata = jadeite::get_metadata()?;
if metadata.jadeite.version > jadeite::get_version(params.patch_folder)? {
return Ok(Self::PatchUpdateAvailable);
}
@ -103,9 +106,9 @@ impl LauncherState {
if !disabled {
return Ok(Self::TelemetryNotDisabled);
}
// Request current patch status from the metadata file
let patch = jadeite::get_metadata()?.games.hsr
let patch = metadata.games.hsr
.for_edition(params.game_edition)
.get_status(version);