ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: properly print error when script read fails

Browse Source
This commit is contained in:
Ryan 2025-03-10 20:27:20 -04:00
parent 4e5b076b60
commit c2d1b415aa
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.rs
View File

@ -9,6 +9,7 @@ mod lua;
mod particle; mod particle;
mod replay; mod replay;
use anyhow::Context;
use arguments::Arguments; use arguments::Arguments;
use azalea::{ use azalea::{
DefaultBotPlugins, DefaultPlugins, brigadier::prelude::CommandDispatcher, prelude::*, DefaultBotPlugins, DefaultPlugins, brigadier::prelude::CommandDispatcher, prelude::*,
@ -32,7 +33,6 @@ use std::{
sync::Arc, sync::Arc,
}; };
const DEFAULT_SCRIPT_PATH: &str = "errornowatcher.lua";
type ListenerMap = Arc<RwLock<HashMap<String, Vec<(String, Function)>>>>; type ListenerMap = Arc<RwLock<HashMap<String, Vec<(String, Function)>>>>;
@ -49,7 +49,7 @@ async fn main() -> anyhow::Result<()> {
console_subscriber::init(); console_subscriber::init();
let args = Arguments::parse(); let args = Arguments::parse();
let script_path = args.script.unwrap_or(PathBuf::from(DEFAULT_SCRIPT_PATH)); let script_path = args.script.unwrap_or(PathBuf::from("errornowatcher.lua"));
let event_listeners = Arc::new(RwLock::new(HashMap::new())); let event_listeners = Arc::new(RwLock::new(HashMap::new()));
let lua = unsafe { Lua::unsafe_new() }; let lua = unsafe { Lua::unsafe_new() };
let globals = lua.globals(); let globals = lua.globals();
@ -57,8 +57,7 @@ async fn main() -> anyhow::Result<()> {
lua::register_globals(&lua, &globals, event_listeners.clone())?; lua::register_globals(&lua, &globals, event_listeners.clone())?;
globals.set("SCRIPT_PATH", &*script_path)?; globals.set("SCRIPT_PATH", &*script_path)?;
lua.load( lua.load(
read_to_string(script_path) read_to_string(&script_path).with_context(|| format!("failed to read {script_path:?}"))?,
.expect(&(DEFAULT_SCRIPT_PATH.to_owned() + " should be in current directory")),
) )
.exec()?; .exec()?;
if let Some(code) = args.exec { if let Some(code) = args.exec {