archtechx/todo-system
1
0
Fork 0
mirror of https://github.com/archtechx/todo-system.git synced 2025-12-12 00:54:03 +00:00
Code Activity

improve gitignore logic

Browse source
This commit is contained in:
Samuel Štancl 2023-11-24 04:52:15 +01:00
parent 61a78bcdd6
commit 35688138e7
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main.rs
View file

@ -97,8 +97,8 @@ fn main() {
if args.verbose { if args.verbose {
eprint!("\n\n"); eprint!("\n\n");
stats.print(); stats.print();
eprintln!("Paths: {:?}", &paths); eprintln!("Paths ({}): {:?}", &paths.len(), &paths);
eprintln!("Excludes: {:?}", &excludes); eprintln!("Excludes ({}): {:?}", &excludes.len(), &excludes);
eprintln!("todo.md: {:?}", &todos_path); eprintln!("todo.md: {:?}", &todos_path);
eprintln!("readme.md: {:?}", &readme_path); eprintln!("readme.md: {:?}", &readme_path);
} }

23
src/scan.rs
View file

@ -1,5 +1,5 @@
use std::io; use std::io;
use std::fs; use std::fs::{self, canonicalize};
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use glob::glob; use glob::glob;
@ -59,15 +59,24 @@ pub fn add_excludes_from_gitignore(base_dir: &PathBuf, excludes: &mut Vec<PathBu
} }
for line in std::fs::read_to_string(gitignore).unwrap().lines() { for line in std::fs::read_to_string(gitignore).unwrap().lines() {
// todo@real this seems to work suboptimally, removing the condition still decreases total visited file count at the expense of larger exclude list
// to debug this, add logging of all visited files (for identifying cause) with a higher verbosity level
if line.trim() == "*" {
excludes.push(base_dir.clone());
break;
}
if line.trim().starts_with('!') {
continue;
}
let mut pattern = base_dir.clone(); let mut pattern = base_dir.clone();
pattern.push(line.trim_matches('/')); pattern.push(line.trim_end_matches("*/").trim_matches('/'));
if let Some(pattern_str) = pattern.to_str() { if let Some(pattern_str) = pattern.to_str() {
for path in glob(pattern_str).unwrap() { for path in glob(pattern_str).unwrap() {
// todo@real readd this check (if it's still needed after implementing the todo below) excludes.push(path.unwrap());
// if ! excludes.contains(path.unwrap()) {
excludes.push(path.unwrap()); // todo@real don't populate the vector with files when the parent directory would be enough. interpret `*`-ending and `/*`-ending lines as full directory excludes, and don't glob the contents
// }
} }
} }
} }
@ -161,7 +170,7 @@ pub fn scan_dir(dir: &Path, entries: &mut Vec<Entry>, excludes: &mut Vec<PathBuf
} }
for exclude in &*excludes { for exclude in &*excludes {
if path == *exclude { if canonicalize(&path).unwrap() == canonicalize(exclude).unwrap() {
continue 'entry; continue 'entry;
} }
} }