actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-21 16:41:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1131 from epage/force-exclude

Browse source 
fix(cli): Respect force-exclude for binary files
This commit is contained in:
Ed Page 2024-10-23 18:22:09 +08:00 committed by GitHub
commit c720ae2384
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/typos-cli/src/bin/typos-cli/main.rs
View file

@ -298,13 +298,20 @@ fn run_checks(args: &args::Args) -> proc_exit::ExitResult {
}; };
if single_threaded { if single_threaded {
typos_cli::file::walk_path(walk.build(), selected_checks, &engine, reporter) typos_cli::file::walk_path(
walk.build(),
selected_checks,
&engine,
reporter,
args.force_exclude,
)
} else { } else {
typos_cli::file::walk_path_parallel( typos_cli::file::walk_path_parallel(
walk.build_parallel(), walk.build_parallel(),
selected_checks, selected_checks,
&engine, &engine,
reporter, reporter,
args.force_exclude,
) )
} }
.map_err(|e| { .map_err(|e| {

9
crates/typos-cli/src/file.rs
View file

@ -669,9 +669,10 @@ pub fn walk_path(
checks: &dyn FileChecker, checks: &dyn FileChecker,
engine: &crate::policy::ConfigEngine<'_>, engine: &crate::policy::ConfigEngine<'_>,
reporter: &dyn report::Report, reporter: &dyn report::Report,
force_exclude: bool,
) -> Result<(), ignore::Error> { ) -> Result<(), ignore::Error> {
for entry in walk { for entry in walk {
walk_entry(entry, checks, engine, reporter)?; walk_entry(entry, checks, engine, reporter, force_exclude)?;
} }
Ok(()) Ok(())
} }
@ -681,11 +682,12 @@ pub fn walk_path_parallel(
checks: &dyn FileChecker, checks: &dyn FileChecker,
engine: &crate::policy::ConfigEngine<'_>, engine: &crate::policy::ConfigEngine<'_>,
reporter: &dyn report::Report, reporter: &dyn report::Report,
force_exclude: bool,
) -> Result<(), ignore::Error> { ) -> Result<(), ignore::Error> {
let error: std::sync::Mutex<Result<(), ignore::Error>> = std::sync::Mutex::new(Ok(())); let error: std::sync::Mutex<Result<(), ignore::Error>> = std::sync::Mutex::new(Ok(()));
walk.run(|| { walk.run(|| {
Box::new(|entry: Result<ignore::DirEntry, ignore::Error>| { Box::new(|entry: Result<ignore::DirEntry, ignore::Error>| {
match walk_entry(entry, checks, engine, reporter) { match walk_entry(entry, checks, engine, reporter, force_exclude) {
Ok(()) => ignore::WalkState::Continue, Ok(()) => ignore::WalkState::Continue,
Err(err) => { Err(err) => {
*error.lock().unwrap() = Err(err); *error.lock().unwrap() = Err(err);
@ -703,6 +705,7 @@ fn walk_entry(
checks: &dyn FileChecker, checks: &dyn FileChecker,
engine: &crate::policy::ConfigEngine<'_>, engine: &crate::policy::ConfigEngine<'_>,
reporter: &dyn report::Report, reporter: &dyn report::Report,
force_exclude: bool,
) -> Result<(), ignore::Error> { ) -> Result<(), ignore::Error> {
let entry = match entry { let entry = match entry {
Ok(entry) => entry, Ok(entry) => entry,
@ -722,7 +725,7 @@ fn walk_entry(
return Ok(()); return Ok(());
} }
if entry.file_type().map(|t| t.is_file()).unwrap_or(true) { if entry.file_type().map(|t| t.is_file()).unwrap_or(true) {
let explicit = entry.depth() == 0; let explicit = entry.depth() == 0 && !force_exclude;
let (path, lookup_path) = if entry.is_stdin() { let (path, lookup_path) = if entry.is_stdin() {
let path = std::path::Path::new("-"); let path = std::path::Path::new("-");
let cwd = std::env::current_dir().map_err(|err| { let cwd = std::env::current_dir().map_err(|err| {

3
crates/typos-cli/tests/cmd/force-exclude.in/binary Normal file
View file

@ -0,0 +1,3 @@
%PDF
hello

2
crates/typos-cli/tests/cmd/force-exclude.toml
View file

@ -1,5 +1,5 @@
bin.name = "typos" bin.name = "typos"
args = "file.ignore ignore/file parent/ignore/file --force-exclude" args = "file.ignore ignore/file parent/ignore/file binary --force-exclude"
stdin = "" stdin = ""
stdout = "" stdout = ""
stderr = "" stderr = ""