diff options
17 files changed, 38 insertions, 9 deletions
@@ -2105,6 +2105,7 @@ dependencies = [ "shirabe-semver", "shirabe-spdx-licenses", "shirabe-symfony-filesystem", + "shirabe-symfony-finder", "shirabe-symfony-process", "tempfile", "tokio", @@ -2122,6 +2123,7 @@ dependencies = [ "shirabe-external-packages", "shirabe-pcre", "shirabe-php-shim", + "shirabe-symfony-finder", ] [[package]] @@ -2228,6 +2230,17 @@ dependencies = [ ] [[package]] +name = "shirabe-symfony-finder" +version = "0.0.1" +dependencies = [ + "chrono", + "indexmap", + "regex", + "shirabe-pcre", + "shirabe-php-shim", +] + +[[package]] name = "shirabe-symfony-process" version = "0.0.1" dependencies = [ @@ -18,6 +18,7 @@ shirabe-php-src = { path = "crates/shirabe-php-src" } shirabe-semver = { path = "crates/shirabe-semver" } shirabe-spdx-licenses = { path = "crates/shirabe-spdx-licenses" } shirabe-symfony-filesystem = { path = "crates/shirabe-symfony-filesystem" } +shirabe-symfony-finder = { path = "crates/shirabe-symfony-finder" } shirabe-symfony-process = { path = "crates/shirabe-symfony-process" } shirabe-symfony-string = { path = "crates/shirabe-symfony-string" } anyhow = "1.0.102" diff --git a/crates/shirabe-class-map-generator/Cargo.toml b/crates/shirabe-class-map-generator/Cargo.toml index 69889ef7..9143487d 100644 --- a/crates/shirabe-class-map-generator/Cargo.toml +++ b/crates/shirabe-class-map-generator/Cargo.toml @@ -7,6 +7,7 @@ edition.workspace = true shirabe-external-packages.workspace = true shirabe-pcre.workspace = true shirabe-php-shim.workspace = true +shirabe-symfony-finder.workspace = true anyhow.workspace = true indexmap.workspace = true diff --git a/crates/shirabe-class-map-generator/src/class_map_generator.rs b/crates/shirabe-class-map-generator/src/class_map_generator.rs index 4a71b28d..7262fd8a 100644 --- a/crates/shirabe-class-map-generator/src/class_map_generator.rs +++ b/crates/shirabe-class-map-generator/src/class_map_generator.rs @@ -4,13 +4,13 @@ use crate::class_map::ClassMap; use crate::file_list::FileList; use crate::php_file_parser::PhpFileParser; use indexmap::indexmap; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PATHINFO_EXTENSION, PHP_INT_MAX, RuntimeException, explode, getcwd, implode, is_dir, is_file, pathinfo, php_regex, preg_quote, realpath, str_replace, str_starts_with, stream_get_wrappers, strlen, strpos, strrpos, strtr, substr, }; +use shirabe_symfony_finder::Finder; use std::path::PathBuf; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony.rs b/crates/shirabe-external-packages/src/symfony.rs index 1cfe2a47..5b9849fd 100644 --- a/crates/shirabe-external-packages/src/symfony.rs +++ b/crates/shirabe-external-packages/src/symfony.rs @@ -1,2 +1 @@ pub mod console; -pub mod finder; diff --git a/crates/shirabe-symfony-finder/Cargo.toml b/crates/shirabe-symfony-finder/Cargo.toml new file mode 100644 index 00000000..bae1d20a --- /dev/null +++ b/crates/shirabe-symfony-finder/Cargo.toml @@ -0,0 +1,14 @@ +[package] +name = "shirabe-symfony-finder" +version.workspace = true +edition.workspace = true + +[dependencies] +shirabe-pcre.workspace = true +shirabe-php-shim.workspace = true +chrono.workspace = true +indexmap.workspace = true +regex.workspace = true + +[lints] +workspace = true diff --git a/crates/shirabe-external-packages/src/symfony/finder/finder.rs b/crates/shirabe-symfony-finder/src/finder.rs index 4cdcf392..2ab096e5 100644 --- a/crates/shirabe-external-packages/src/symfony/finder/finder.rs +++ b/crates/shirabe-symfony-finder/src/finder.rs @@ -6,7 +6,7 @@ //! `RecursiveDirectoryIterator` attaches to each `SplFileInfo` is carried on the //! private `Entry` struct so the path/exclude filters keep their exact behavior. -use crate::symfony::finder::glob::Glob; +use crate::glob::Glob; use chrono::{NaiveDate, NaiveDateTime}; use indexmap::{IndexMap, IndexSet}; use shirabe_pcre::{CaptureKey, Preg}; diff --git a/crates/shirabe-external-packages/src/symfony/finder/glob.rs b/crates/shirabe-symfony-finder/src/glob.rs index 247b772f..247b772f 100644 --- a/crates/shirabe-external-packages/src/symfony/finder/glob.rs +++ b/crates/shirabe-symfony-finder/src/glob.rs diff --git a/crates/shirabe-external-packages/src/symfony/finder.rs b/crates/shirabe-symfony-finder/src/lib.rs index 4b2d4b84..4b2d4b84 100644 --- a/crates/shirabe-external-packages/src/symfony/finder.rs +++ b/crates/shirabe-symfony-finder/src/lib.rs diff --git a/crates/shirabe-external-packages/src/symfony/finder/spl_file_info.rs b/crates/shirabe-symfony-finder/src/spl_file_info.rs index 6f03fe14..6f03fe14 100644 --- a/crates/shirabe-external-packages/src/symfony/finder/spl_file_info.rs +++ b/crates/shirabe-symfony-finder/src/spl_file_info.rs diff --git a/crates/shirabe/Cargo.toml b/crates/shirabe/Cargo.toml index 17b348ce..b5b84f73 100644 --- a/crates/shirabe/Cargo.toml +++ b/crates/shirabe/Cargo.toml @@ -13,6 +13,7 @@ shirabe-php-shim.workspace = true shirabe-semver.workspace = true shirabe-spdx-licenses.workspace = true shirabe-symfony-filesystem.workspace = true +shirabe-symfony-finder.workspace = true shirabe-symfony-process.workspace = true anyhow.workspace = true async-trait.workspace = true diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs index 11afe2cb..435e45c6 100644 --- a/crates/shirabe/src/cache.rs +++ b/crates/shirabe/src/cache.rs @@ -6,13 +6,13 @@ use crate::util::Filesystem; use crate::util::Platform; use crate::util::Silencer; use chrono::Utc; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ ErrorException, bin2hex, clearstatcache, date_format_to_strftime, dirname, disk_free_space, file_exists, file_get_contents, file_put_contents, filemtime, function_exists, hash_file, is_dir, is_writable, mkdir, php_regex, random_bytes, random_int, rename, time, unlink, }; +use shirabe_symfony_finder::Finder; use std::sync::Mutex; /// Reads/writes to a filesystem cache diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 4d2f259b..7a11e44e 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -40,7 +40,6 @@ use shirabe_external_packages::seld::signal::SignalHandler; use shirabe_external_packages::symfony::console::command::command::Command; use shirabe_external_packages::symfony::console::input::InputInterface; use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ @@ -48,6 +47,7 @@ use shirabe_php_shim::{ chdir, explode_with_limit, file_exists, getcwd, impl_php_class, implode, is_dir, is_file, mkdir, realpath, rtrim, strtolower, unlink, }; +use shirabe_symfony_finder::Finder; use std::path::PathBuf; /// Install a package as new project into new directory. diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 097fc1af..894782e4 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -8,11 +8,11 @@ use crate::package::PackageInterfaceHandle; use crate::util::Filesystem; use crate::util::Platform; use indexmap::IndexMap; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{ PhpMixed, RuntimeException, bin2hex, file_exists, is_dir, random_bytes, realpath, }; +use shirabe_symfony_finder::Finder; use std::path::{Path, PathBuf}; pub trait ArchiveDownloader { diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 7c524283..72fe0646 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -4,9 +4,9 @@ use crate::package::archiver::BaseExcludeFilter; use crate::package::archiver::ComposerExcludeFilter; use crate::package::archiver::GitExcludeFilter; use crate::util::Filesystem; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::Preg; use shirabe_php_shim::{RuntimeException, preg_quote, realpath}; +use shirabe_symfony_finder::Finder; use std::path::{Path, PathBuf}; pub struct ArchivableFilesFinder { diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index a899d90f..e5487038 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php -use shirabe_external_packages::symfony::finder::Glob; use shirabe_pcre::Preg; +use shirabe_symfony_finder::Glob; #[derive(Debug)] pub struct BaseExcludeFilterBase { diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index bf7107f7..b46e7913 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -3,7 +3,6 @@ use crate::util::Platform; use crate::util::ProcessExecutor; use crate::util::Silencer; -use shirabe_external_packages::symfony::finder::Finder; use shirabe_pcre::Preg; use shirabe_php_shim::{ ErrorException, LogicException, PhpMixed, RuntimeException, array_pop, basename, chdir, @@ -15,6 +14,7 @@ use shirabe_php_shim::{ var_export, }; use shirabe_symfony_filesystem::exception::IOException; +use shirabe_symfony_finder::Finder; use std::path::Path; #[derive(Debug)] |