StrafesNET/remote-script-review
3
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tidy id from filename code

Browse Source
This commit is contained in:
Quaternions 2024-12-26 19:41:41 -08:00
parent 3eb39f2c6c
commit a6b8b326f1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@ -234,10 +234,9 @@ async fn get_allowed_map()->Result<std::collections::HashMap::<u32,String>,GetMa
read_dir_stream(tokio::fs::read_dir("scripts/allowed").await.map_err(GetMapError::IO)?) read_dir_stream(tokio::fs::read_dir("scripts/allowed").await.map_err(GetMapError::IO)?)
.map(|dir_entry|async{ .map(|dir_entry|async{
let path=dir_entry.map_err(GetMapError::IO)?.path(); let path=dir_entry.map_err(GetMapError::IO)?.path();
let id:u32=path.file_stem() let id:u32=path
.ok_or(GetMapError::FileStem)? .file_stem().ok_or(GetMapError::FileStem)?
.to_str() .to_str().ok_or(GetMapError::ToStr)?
.ok_or(GetMapError::ToStr)?
.parse().map_err(GetMapError::ParseInt)?; .parse().map_err(GetMapError::ParseInt)?;
let source=tokio::fs::read_to_string(path).await.map_err(GetMapError::IO)?; let source=tokio::fs::read_to_string(path).await.map_err(GetMapError::IO)?;
Ok((id,source)) Ok((id,source))
@ -250,10 +249,9 @@ async fn get_replace_map()->Result<std::collections::HashMap::<String,u32>,GetMa
read_dir_stream(tokio::fs::read_dir("scripts/replace").await.map_err(GetMapError::IO)?) read_dir_stream(tokio::fs::read_dir("scripts/replace").await.map_err(GetMapError::IO)?)
.map(|dir_entry|async{ .map(|dir_entry|async{
let path=dir_entry.map_err(GetMapError::IO)?.path(); let path=dir_entry.map_err(GetMapError::IO)?.path();
let id:u32=path.file_stem() let id:u32=path
.ok_or(GetMapError::FileStem)? .file_stem().ok_or(GetMapError::FileStem)?
.to_str() .to_str().ok_or(GetMapError::ToStr)?
.ok_or(GetMapError::ToStr)?
.parse().map_err(GetMapError::ParseInt)?; .parse().map_err(GetMapError::ParseInt)?;
let source=tokio::fs::read_to_string(path).await.map_err(GetMapError::IO)?; let source=tokio::fs::read_to_string(path).await.map_err(GetMapError::IO)?;
Ok((source,id)) Ok((source,id))