lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2025-04-04 10:30:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Check if not FileNotFound instead of if SyntaxError

Browse source
This commit is contained in:
Someon1e 2024-04-08 17:46:50 +01:00
parent 087ecbd4f1
commit ba9ebb2a53
No known key found for this signature in database
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/lune/globals/require/path.rs
View file

@ -1,6 +1,8 @@
use std::io::ErrorKind;
use std::path::{Path, PathBuf};
use mlua::prelude::*;
use mlua::Error::ExternalError;
use super::context::*;
@ -29,13 +31,9 @@ where
// 1. Try to require the exact path
match require_inner(lua, ctx, &abs_path, &rel_path).await {
Ok(res) => return Ok(res),
Err(error) => {
if let LuaError::SyntaxError {
message: _,
incomplete_input: _,
} = error
{
return Err(error);
Err(err) => {
if !is_file_not_found_error(&err) {
return Err(err);
}
}
}
@ -52,13 +50,9 @@ where
.await
{
Ok(res) => return Ok(res),
Err(error) => {
if let LuaError::SyntaxError {
message: _,
incomplete_input: _,
} = error
{
return Err(error);
Err(err) => {
if !is_file_not_found_error(&err) {
return Err(err);
}
}
}
@ -81,13 +75,9 @@ where
.await
{
Ok(res) => return Ok(res),
Err(error) => {
if let LuaError::SyntaxError {
message: _,
incomplete_input: _,
} = error
{
return Err(error);
Err(err) => {
if !is_file_not_found_error(&err) {
return Err(err);
}
}
}
@ -130,3 +120,15 @@ fn append_extension(path: impl Into<PathBuf>, ext: &'static str) -> PathBuf {
};
new
}
fn is_file_not_found_error(err: &LuaError) -> bool {
if let ExternalError(err) = err {
if let Some(err) = err.as_ref().downcast_ref::<std::io::Error>() {
err.kind() == ErrorKind::NotFound
} else {
false
}
} else {
false
}
}