lune-org/lune
1
1
Fork 0
mirror of https://github.com/lune-org/lune.git synced 2024-12-12 04:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix readDir with trailing forward-slash on Windows (#220)

Browse source
This commit is contained in:
Maxwell Ruben 2024-07-06 15:34:12 -05:00 committed by GitHub
parent 95c2ca0965
commit cb552af660
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/lune-std-fs/src/lib.rs Normal file → Executable file
View file

@ -1,7 +1,7 @@
#![allow(clippy::cargo_common_metadata)] #![allow(clippy::cargo_common_metadata)]
use std::io::ErrorKind as IoErrorKind; use std::io::ErrorKind as IoErrorKind;
use std::path::{PathBuf, MAIN_SEPARATOR}; use std::path::PathBuf;
use bstr::{BString, ByteSlice}; use bstr::{BString, ByteSlice};
use mlua::prelude::*; use mlua::prelude::*;
@ -50,29 +50,16 @@ async fn fs_read_dir(_: &Lua, path: String) -> LuaResult<Vec<String>> {
let mut dir_strings = Vec::new(); let mut dir_strings = Vec::new();
let mut dir = fs::read_dir(&path).await.into_lua_err()?; let mut dir = fs::read_dir(&path).await.into_lua_err()?;
while let Some(dir_entry) = dir.next_entry().await.into_lua_err()? { while let Some(dir_entry) = dir.next_entry().await.into_lua_err()? {
if let Some(dir_path_str) = dir_entry.path().to_str() { if let Some(dir_name_str) = dir_entry.file_name().to_str() {
dir_strings.push(dir_path_str.to_owned()); dir_strings.push(dir_name_str.to_owned());
} else { } else {
return Err(LuaError::RuntimeError(format!( return Err(LuaError::RuntimeError(format!(
"File path could not be converted into a string: '{}'", "File name could not be converted into a string: '{}'",
dir_entry.path().display() dir_entry.file_name().to_string_lossy()
))); )));
} }
} }
let mut dir_string_prefix = path; Ok(dir_strings)
if !dir_string_prefix.ends_with(MAIN_SEPARATOR) {
dir_string_prefix.push(MAIN_SEPARATOR);
}
let dir_strings_no_prefix = dir_strings
.iter()
.map(|inner_path| {
inner_path
.trim()
.trim_start_matches(&dir_string_prefix)
.to_owned()
})
.collect::<Vec<_>>();
Ok(dir_strings_no_prefix)
} }
async fn fs_write_file(_: &Lua, (path, contents): (String, BString)) -> LuaResult<()> { async fn fs_write_file(_: &Lua, (path, contents): (String, BString)) -> LuaResult<()> {