Jayrude
/
thief-book-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up obtaining book file name and language

This commit is contained in:
Jarrod Doyle 2024-02-05 17:15:23 +00:00
parent df5d0041d3
commit ab294843e4
Signed by: Jayrude
GPG Key ID: 38B57B16E7C0ADF7
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/project.rs
View File

@ -1,4 +1,8 @@
use std::{collections::HashMap, ffi::OsStr, path::PathBuf}; use std::{
collections::HashMap,
ffi::OsStr,
path::{Path, PathBuf},
};
use walkdir::WalkDir; use walkdir::WalkDir;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -24,39 +28,27 @@ impl ProjectState {
continue; continue;
} }
let extension = entry.path().extension().and_then(OsStr::to_str); let path = entry.path();
let extension = path.extension().and_then(OsStr::to_str);
if extension.is_some_and(|ext| ext.to_lowercase() == "str") { if extension.is_some_and(|ext| ext.to_lowercase() == "str") {
let language = entry let language = file_name_string(path.parent().unwrap()).to_lowercase();
.path() let file_name = file_name_string(path).to_lowercase();
.parent()
.unwrap()
.strip_prefix(search_path.clone())
.unwrap()
.to_str()
.unwrap()
.to_owned()
.to_lowercase();
let file_name = entry
.file_name()
.to_str()
.unwrap()
.to_owned()
.to_lowercase();
books books
.entry(file_name.clone()) .entry(file_name.clone())
.and_modify(|b: &mut Book| b.languages.push(language.clone())) .and_modify(|b: &mut Book| b.languages.push(language.clone()))
.or_insert(Book { .or_insert(Book {
path: entry.path().to_owned(), path: path.to_owned(),
file_name, file_name,
languages: vec![language], languages: vec![language],
}); });
// books.push(Book {
// path: entry.path().to_owned(),
// file_name: entry.file_name().to_str().unwrap().to_owned(),
// });
} }
} }
Self { path, books } Self { path, books }
} }
} }
fn file_name_string(path: &Path) -> String {
let file_name = path.file_name();
file_name.map(|s| s.to_str().unwrap().to_owned()).unwrap()
}