enhance(file):修正扫描文件时的排序。

This commit is contained in:
徐涛 2023-03-08 18:50:43 +08:00
parent 6e5c9c5c5f
commit 51c0e1afa7

View File

@ -10,7 +10,7 @@ pub struct FileItem {
#[tauri::command] #[tauri::command]
pub fn scan_directory(target: String) -> Result<Vec<FileItem>, String> { pub fn scan_directory(target: String) -> Result<Vec<FileItem>, String> {
WalkDir::new(target) let mut file_items = WalkDir::new(target)
.into_iter() .into_iter()
.filter_map(|f| f.ok()) .filter_map(|f| f.ok())
.filter(|f| f.path().is_file()) .filter(|f| f.path().is_file())
@ -32,5 +32,8 @@ pub fn scan_directory(target: String) -> Result<Vec<FileItem>, String> {
}) })
}) })
.collect::<Result<Vec<FileItem>, anyhow::Error>>() .collect::<Result<Vec<FileItem>, anyhow::Error>>()
.map_err(|e| e.to_string()) .map_err(|e| e.to_string())?;
file_items.sort_by(|a, b| a.filename.partial_cmp(&b.filename).unwrap());
Ok(file_items)
} }