Skip to content

feat: add glob pattern expansion to CLI find search paths and environment directories (Fixes #354) #362

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

Open
karthiknadig wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add glob pattern expansion to CLI find search paths and environment directories (Fixes #354) #362

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
15 changes: 9 additions & 6 deletions crates/pet/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use pet_core::os_environment::Environment;
use pet_core::python_environment::PythonEnvironmentKind;
use pet_core::Locator;
use pet_core::{os_environment::EnvironmentApi, reporter::Reporter, Configuration};
use pet_fs::glob::expand_glob_patterns;
use pet_poetry::Poetry;
use pet_poetry::PoetryLocator;
use pet_python_utils::cache::set_cache_directory;
Expand Down Expand Up @@ -138,8 +139,8 @@ fn create_config(options: &FindOptions) -> Configuration {
let mut config = Configuration::default();

let mut search_paths = vec![];
if let Some(dirs) = options.search_paths.clone() {
search_paths.extend(dirs);
if let Some(dirs) = options.search_paths.as_ref() {
search_paths.extend(expand_glob_patterns(dirs));
}
// If workspace folders have been provided do not add cwd.
if search_paths.is_empty() {
Expand Down Expand Up @@ -168,10 +169,12 @@ fn create_config(options: &FindOptions) -> Configuration {
config.conda_executable = options.conda_executable.clone();
config.pipenv_executable = options.pipenv_executable.clone();
config.poetry_executable = options.poetry_executable.clone();
config.environment_directories = options
.environment_directories
.clone()
.map(|dirs| dirs.into_iter().filter(|p| p.is_dir()).collect());
config.environment_directories = options.environment_directories.as_ref().map(|dirs| {
expand_glob_patterns(dirs)
.into_iter()
.filter(|p| p.is_dir())
.collect()
});

config
}
Expand Down
Loading