SEGAy/saekawa
1
0
Fork 0
mirror of https://github.com/beerpiss/saekawa.git synced 2024-11-14 10:37:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: actually respect the auto-update configuration

Browse Source
This commit is contained in:
beerpiss 2024-06-27 00:49:00 +07:00
parent 8a0507f03c
commit 2abbd7b79d
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib.rs
View File

@ -20,7 +20,6 @@ use crate::{
helpers::winapi_ext::LibraryHandle, helpers::winapi_ext::LibraryHandle,
logging::init_logger, logging::init_logger,
saekawa::{hook_init, hook_release}, saekawa::{hook_init, hook_release},
updater::self_update,
}; };
#[no_mangle] #[no_mangle]
@ -45,19 +44,7 @@ extern "system" fn DllMain(dll_module: HINSTANCE, call_reason: DWORD, reserved:
env!("VERGEN_GIT_BRANCH"), env!("VERGEN_GIT_BRANCH"),
); );
match self_update(&library_handle) { if let Err(e) = hook_init(library_handle) {
Ok(should_reboot) => {
if should_reboot {
info!("Self-update successful. Reloading into new hook...");
library_handle.free_and_exit_thread(1);
}
}
Err(e) => {
error!("Self-update failed: {e:#}");
}
}
if let Err(e) = hook_init() {
error!("Failed to initialize hook: {e:#}"); error!("Failed to initialize hook: {e:#}");
} }
}); });

20
src/saekawa.rs
View File

@ -25,11 +25,11 @@ use crate::{
config::{ConfigLoadError, SaekawaConfig}, config::{ConfigLoadError, SaekawaConfig},
helpers::{ helpers::{
chuni_encoding::{decrypt_aes256_cbc, hash_endpoint, maybe_decompress_buffer}, chuni_encoding::{decrypt_aes256_cbc, hash_endpoint, maybe_decompress_buffer},
winapi_ext::{winhttp_query_option, ReadStringFnError}, winapi_ext::{winhttp_query_option, LibraryHandle, ReadStringFnError},
}, },
score_import::execute_score_import, score_import::execute_score_import,
sigscan::{self, CryptoKeys}, sigscan::{self, CryptoKeys},
types::{chuni::UpsertUserAllRequest, ToBatchManual}, types::{chuni::UpsertUserAllRequest, ToBatchManual}, updater::self_update,
}; };
#[derive(Debug, Snafu)] #[derive(Debug, Snafu)]
@ -96,10 +96,24 @@ static UPSERT_USER_ALL_API: OnceLock<String> = OnceLock::new();
static CONFIG: OnceLock<SaekawaConfig> = OnceLock::new(); static CONFIG: OnceLock<SaekawaConfig> = OnceLock::new();
pub fn hook_init() -> Result<(), HookError> { pub fn hook_init(library_handle: LibraryHandle) -> Result<(), HookError> {
debug!("Reading hook configuration"); debug!("Reading hook configuration");
let config = SaekawaConfig::load().context(ConfigSnafu)?; let config = SaekawaConfig::load().context(ConfigSnafu)?;
if config.general.auto_update {
match self_update(&library_handle) {
Ok(should_reboot) => {
if should_reboot {
info!("Self-update successful. Reloading into new hook...");
library_handle.free_and_exit_thread(1);
}
}
Err(e) => {
error!("Self-update failed: {e:#}");
}
}
}
if config.cards.is_empty() { if config.cards.is_empty() {
return Err(HookError::NoCardsError); return Err(HookError::NoCardsError);
} }