diff --git a/src/config.rs b/src/config.rs index 55b0c53..3ae7c29 100644 --- a/src/config.rs +++ b/src/config.rs @@ -94,9 +94,9 @@ impl Default for Config { is_archipelago: true, is_spiral_abyss: true, is_demonic_energy: true, - is_forest: true, + is_forest: false, is_decompose: true, - is_attack_power: true, + is_attack_power: false, is_equip_transform: true, } } diff --git a/src/lib.rs b/src/lib.rs index 03d709b..924b91f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,53 +75,42 @@ fn to_utf8(string: &CxxString) -> String { cxx_string_to_string(string).to_string() } +fn push_log(t: MessageType, msg: String) { + if let Some(lock) = LOGGER_SENDER.get() { + let _ = lock.send(Starpoles { + r#type: t.into(), + message: msg.clone(), + }); + } +} + fn log_error(msg: &cxx::CxxString) { let msg = cxx_string_to_string(msg); - let lock = LOGGER_SENDER.get().unwrap(); - let _ = lock.send(Starpoles { - r#type: MessageType::Error.into(), - message: msg.clone(), - }); + push_log(MessageType::Error, msg.clone()); error!("{}", msg); } fn log_warning(msg: &cxx::CxxString) { let msg = cxx_string_to_string(msg); - let lock = LOGGER_SENDER.get().unwrap(); - let _ = lock.send(Starpoles { - r#type: MessageType::Warning.into(), - message: msg.clone(), - }); + push_log(MessageType::Warning, msg.clone()); warn!("{}", msg); } fn log_info(msg: &cxx::CxxString) { let msg = cxx_string_to_string(msg); - let lock = LOGGER_SENDER.get().unwrap(); - let _ = lock.send(Starpoles { - r#type: MessageType::Info.into(), - message: msg.clone(), - }); + push_log(MessageType::Info, msg.clone()); info!("{}", msg); } fn log_debug(msg: &cxx::CxxString) { let msg = cxx_string_to_string(msg); - let lock = LOGGER_SENDER.get().unwrap(); - let _ = lock.send(Starpoles { - r#type: MessageType::Debug.into(), - message: msg.clone(), - }); + push_log(MessageType::Debug, msg.clone()); debug!("{}", msg); } fn log_trace(msg: &cxx::CxxString) { let msg = cxx_string_to_string(msg); - let lock = LOGGER_SENDER.get().unwrap(); - let _ = lock.send(Starpoles { - r#type: MessageType::Trace.into(), - message: msg.clone(), - }); + push_log(MessageType::Trace, msg.clone()); trace!("{}", msg); }