From b2e169bce39278293d8729a18499fb9a4a0c7a8b Mon Sep 17 00:00:00 2001 From: Alex Pasmantier Date: Thu, 1 May 2025 22:19:18 +0200 Subject: [PATCH] refactor: drop dependency to the `ignore` crate --- Cargo.lock | 17 ----------------- Cargo.toml | 1 - television/utils/files.rs | 34 ---------------------------------- 3 files changed, 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3bb1c30..487c23e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1001,22 +1001,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "ignore" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata 0.4.9", - "same-file", - "walkdir", - "winapi-util", -] - [[package]] name = "image" version = "0.25.6" @@ -2225,7 +2209,6 @@ dependencies = [ "directories", "gag", "human-panic", - "ignore", "image", "nom", "nucleo", diff --git a/Cargo.toml b/Cargo.toml index d7460c3..f216d07 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,6 @@ ratatui = { version = "0.29", features = ["serde", "macros"] } better-panic = "0.3" signal-hook = "0.3" human-panic = "2.0" -ignore = "0.4" strum = { version = "0.26", features = ["derive"] } regex = "1.11" parking_lot = "0.12" diff --git a/television/utils/files.rs b/television/utils/files.rs index 70400b4..7e03cfa 100644 --- a/television/utils/files.rs +++ b/television/utils/files.rs @@ -5,10 +5,8 @@ use std::io::BufRead; use std::io::BufReader; use std::io::Read; use std::path::Path; -use std::path::PathBuf; use std::sync::OnceLock; -use ignore::{overrides::Override, types::TypesBuilder, WalkBuilder}; use tracing::{debug, warn}; use crate::utils::strings::{ @@ -67,38 +65,6 @@ pub fn get_default_num_threads() -> usize { *DEFAULT_NUM_THREADS.get_or_init(default_num_threads) } -pub fn walk_builder( - path: &Path, - n_threads: usize, - overrides: Option, - ignore_paths: Option>, -) -> WalkBuilder { - let mut builder = WalkBuilder::new(path); - - // ft-based filtering - let mut types_builder = TypesBuilder::new(); - types_builder.add_defaults(); - builder.types(types_builder.build().unwrap()); - - // ignore paths - if let Some(paths) = ignore_paths { - builder.filter_entry(move |e| { - let path = e.path(); - if paths.iter().any(|p| path.starts_with(p)) { - debug!("Ignoring path: {:?}", path); - return false; - } - true - }); - } - - builder.threads(n_threads); - if let Some(ov) = overrides { - builder.overrides(ov); - } - builder -} - pub fn get_file_size(path: &Path) -> Option { std::fs::metadata(path).ok().map(|m| m.len()) }