Skip to content

fix: Search gitignored directories for config files #12791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rmburg wants to merge 1 commit into from
Closed

fix: Search gitignored directories for config files #12791

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 15 additions & 23 deletions crates/tauri-cli/src/helpers/app_paths.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ use std::{
};

use ignore::WalkBuilder;
use walkdir::WalkDir;

use tauri_utils::{
config::parse::{folder_has_configuration_file, is_configuration_file, ConfigFormat},
Expand Down Expand Up @@ -44,33 +45,24 @@ pub fn walk_builder(path: &Path) -> WalkBuilder {
}

fn lookup<F: Fn(&PathBuf) -> bool>(dir: &Path, checker: F) -> Option<PathBuf> {
let mut builder = walk_builder(dir);
builder
.require_git(false)
.ignore(false)
.max_depth(Some(
std::env::var("TAURI_CLI_CONFIG_DEPTH")
.map(|d| {
d.parse()
.expect("`TAURI_CLI_CONFIG_DEPTH` environment variable must be a positive integer")
})
.unwrap_or(3),
))
.sort_by_file_path(|a, _| {
if a.extension().is_some() {
let max_depth = std::env::var("TAURI_CLI_CONFIG_DEPTH").map_or(3, |d| {
d.parse()
.expect("`TAURI_CLI_CONFIG_DEPTH` environment variable must be a positive integer")
});

WalkDir::new(dir)
.max_depth(max_depth)
.sort_by(|a, _| {
if a.path().extension().is_some() {
Ordering::Less
} else {
Ordering::Greater
}
});

for entry in builder.build().flatten() {
let path = dir.join(entry.path());
if checker(&path) {
return Some(path);
}
}
None
})
.into_iter()
.flatten()
.map(|entry| entry.into_path())
.find(checker)
}

fn env_tauri_app_path() -> Option<PathBuf> {
Expand Down