leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

requested changes

Browse source
This commit is contained in:
Francesco Pio Gaglione 2024-10-04 19:02:22 +02:00
parent 613cbdaee9
commit f93ce73023
1 changed files with 11 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/tab.rs
View file

@ -447,7 +447,7 @@ pub fn item_from_path<P: Into<PathBuf>>(path: P, sizes: IconSizes) -> Result<Ite
pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> { pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
let mut items = Vec::new(); let mut items = Vec::new();
let mut hidden_file = Vec::new(); let mut hidden_files = Vec::new();
match fs::read_dir(tab_path) { match fs::read_dir(tab_path) {
Ok(entries) => { Ok(entries) => {
for entry_res in entries { for entry_res in entries {
@ -474,7 +474,7 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
}; };
if name == ".hidden" { if name == ".hidden" {
hidden_file = parse_hidden_file(&path); hidden_files = parse_hidden_file(&path);
} }
let metadata = match fs::metadata(&path) { let metadata = match fs::metadata(&path) {
@ -498,14 +498,12 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
_ => LANGUAGE_SORTER.compare(&a.display_name, &b.display_name), _ => LANGUAGE_SORTER.compare(&a.display_name, &b.display_name),
}); });
items.iter_mut().for_each(|mut item| { items.iter_mut().for_each(|mut item| {
if item.path_opt().is_some() { if hidden_files
if hidden_file .iter()
.iter() .find(|hidden| &&item.name == hidden)
.find(|hidden| hidden.eq(&item.path_opt().unwrap())) .is_some()
.is_some() {
{ item.hidden = true;
item.hidden = true;
}
} }
}); });
items items
@ -1376,27 +1374,19 @@ fn folder_name<P: AsRef<Path>>(path: P) -> (String, bool) {
} }
// parse .hidden file and return files path // parse .hidden file and return files path
fn parse_hidden_file(path: &PathBuf) -> Vec<PathBuf> { fn parse_hidden_file(path: &PathBuf) -> Vec<String> {
let parent_dir = match path.parent() {
Some(dir) => dir,
None => return Vec::new(),
};
let file = match File::open(path) { let file = match File::open(path) {
Ok(f) => f, Ok(f) => f,
Err(_) => return Vec::new(), Err(_) => return Vec::new(),
}; };
let reader = BufReader::new(file); let reader = BufReader::new(file);
let mut paths: Vec<PathBuf> = Vec::new(); let mut paths: Vec<String> = Vec::new();
for line in reader.lines() { for line in reader.lines() {
if let Ok(line) = line { if let Ok(line) = line {
if !line.is_empty() { if !line.is_empty() {
let file_path = parent_dir.join(&line.trim()); paths.push(line.trim().to_string());
if file_path.exists() {
paths.push(file_path);
}
} }
} }
} }