diff options
Diffstat (limited to 'crates/shirabe/src/downloader')
22 files changed, 225 insertions, 221 deletions
diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 45121ee..3346275 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -2,17 +2,17 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, RuntimeException, bin2hex, file_exists, is_dir, random_bytes, realpath, }; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::package::package_interface::PackageInterface; -use crate::util::platform::Platform; +use crate::dependency_resolver::operation::InstallOperation; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::package::PackageInterface; +use crate::util::Platform; pub trait ArchiveDownloader { fn inner(&self) -> &FileDownloader; diff --git a/crates/shirabe/src/downloader/change_report_interface.rs b/crates/shirabe/src/downloader/change_report_interface.rs index 2148689..f5e686a 100644 --- a/crates/shirabe/src/downloader/change_report_interface.rs +++ b/crates/shirabe/src/downloader/change_report_interface.rs @@ -2,7 +2,7 @@ use anyhow::Result; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait ChangeReportInterface { fn get_local_changes( diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs index 630f16d..e81a6bb 100644 --- a/crates/shirabe/src/downloader/download_manager.rs +++ b/crates/shirabe/src/downloader/download_manager.rs @@ -3,19 +3,19 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, RuntimeException, array_keys, array_reverse, array_shift, dirname, get_class, implode, in_array, preg_quote, rtrim, sprintf, str_replace, strtolower, usort, }; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; +use crate::downloader::DownloaderInterface; +use crate::exception::IrrecoverableDownloadException; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; /// Downloaders manager. #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/downloader_interface.rs b/crates/shirabe/src/downloader/downloader_interface.rs index 11ec928..9ced979 100644 --- a/crates/shirabe/src/downloader/downloader_interface.rs +++ b/crates/shirabe/src/downloader/downloader_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Downloader/DownloaderInterface.php -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait DownloaderInterface: std::fmt::Debug { fn get_installation_source(&self) -> String; @@ -81,25 +81,21 @@ pub trait DownloaderInterface: std::fmt::Debug { ) -> anyhow::Result<Box<dyn PromiseInterface>>; /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. - fn as_change_report_interface( - &self, - ) -> Option<&dyn crate::downloader::change_report_interface::ChangeReportInterface> { + fn as_change_report_interface(&self) -> Option<&dyn crate::downloader::ChangeReportInterface> { None } /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. fn as_vcs_capable_downloader_interface( &self, - ) -> Option< - &dyn crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface, - > { + ) -> Option<&dyn crate::downloader::VcsCapableDownloaderInterface> { None } /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. fn as_dvcs_downloader_interface( &self, - ) -> Option<&dyn crate::downloader::dvcs_downloader_interface::DvcsDownloaderInterface> { + ) -> Option<&dyn crate::downloader::DvcsDownloaderInterface> { None } } diff --git a/crates/shirabe/src/downloader/dvcs_downloader_interface.rs b/crates/shirabe/src/downloader/dvcs_downloader_interface.rs index df82629..94c3e4f 100644 --- a/crates/shirabe/src/downloader/dvcs_downloader_interface.rs +++ b/crates/shirabe/src/downloader/dvcs_downloader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/DvcsDownloaderInterface.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait DvcsDownloaderInterface { fn get_unpushed_changes(&self, package: &dyn PackageInterface, path: String) -> Option<String>; diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index 48160e6..4d33370 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -5,8 +5,8 @@ use anyhow::Result; use indexmap::IndexMap; use std::sync::{LazyLock, Mutex}; -use crate::util::silencer::Silencer; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::util::Silencer; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_external_packages::react::promise::resolve as react_promise_resolve; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, InvalidArgumentException, PATHINFO_BASENAME, PATHINFO_EXTENSION, @@ -17,27 +17,27 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::downloader::change_report_interface::ChangeReportInterface; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::max_file_size_exceeded_exception::MaxFileSizeExceededException; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::comparer::comparer::Comparer; -use crate::package::package_interface::PackageInterface; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::post_file_download_event::PostFileDownloadEvent; -use crate::plugin::pre_file_download_event::PreFileDownloadEvent; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url as UrlUtil; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::ChangeReportInterface; +use crate::downloader::DownloaderInterface; +use crate::downloader::MaxFileSizeExceededException; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::exception::IrrecoverableDownloadException; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::PackageInterface; +use crate::package::comparer::Comparer; +use crate::plugin::PluginEvents; +use crate::plugin::PostFileDownloadEvent; +use crate::plugin::PreFileDownloadEvent; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url as UrlUtil; /// @var array<string, int|string> /// @private diff --git a/crates/shirabe/src/downloader/fossil_downloader.rs b/crates/shirabe/src/downloader/fossil_downloader.rs index 8842a3a..363fd50 100644 --- a/crates/shirabe/src/downloader/fossil_downloader.rs +++ b/crates/shirabe/src/downloader/fossil_downloader.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Downloader/FossilDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::RuntimeException; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index 519f48a..668a5e9 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -3,9 +3,9 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_external_packages::react::promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ PhpMixed, RuntimeException, array_map, basename, dirname, implode, in_array, is_dir, preg_quote, realpath, rtrim, sprintf, strlen, strpos, substr, trim, version_compare, @@ -13,15 +13,15 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::dvcs_downloader_interface::DvcsDownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::git::Git as GitUtil; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::downloader::DvcsDownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::Git as GitUtil; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url; #[derive(Debug)] pub struct GitDownloader { @@ -1360,7 +1360,7 @@ impl DvcsDownloaderInterface for GitDownloader { // TODO(phase-b): GitDownloader extends VcsDownloader which implements DownloaderInterface. // Delegating each trait method to todo!() until the inner VcsDownloaderBase exposes the // matching impl surface. -impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloader { +impl crate::downloader::DownloaderInterface for GitDownloader { fn get_installation_source(&self) -> String { todo!() } @@ -1371,9 +1371,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _path: &str, _prev_package: Option<&dyn PackageInterface>, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1383,9 +1381,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _prev_package: Option<&dyn PackageInterface>, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1394,9 +1390,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1405,9 +1399,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _initial: &dyn PackageInterface, _target: &dyn PackageInterface, _path: &str, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1416,9 +1408,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1428,9 +1418,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _prev_package: Option<&dyn PackageInterface>, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } } diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 43d174a..9a6a258 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, PATHINFO_FILENAME, PHP_URL_PATH, PhpMixed, RuntimeException, extension_loaded, fclose, fopen, fwrite, gzclose, gzopen, gzread, implode, parse_url, pathinfo, @@ -130,7 +130,7 @@ impl GzipDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for GzipDownloader { +impl crate::downloader::DownloaderInterface for GzipDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/hg_downloader.rs b/crates/shirabe/src/downloader/hg_downloader.rs index 4ccb150..986a214 100644 --- a/crates/shirabe/src/downloader/hg_downloader.rs +++ b/crates/shirabe/src/downloader/hg_downloader.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Downloader/HgDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::hg::Hg as HgUtils; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::Hg as HgUtils; +use crate::util::ProcessExecutor; use anyhow::Result; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::RuntimeException; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs b/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs index 4e18761..ebec74d 100644 --- a/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs +++ b/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/MaxFileSizeExceededException.php -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; #[derive(Debug)] pub struct MaxFileSizeExceededException(pub TransportException); diff --git a/crates/shirabe/src/downloader/mod.rs b/crates/shirabe/src/downloader/mod.rs index 391ae23..4f7641b 100644 --- a/crates/shirabe/src/downloader/mod.rs +++ b/crates/shirabe/src/downloader/mod.rs @@ -21,3 +21,27 @@ pub mod vcs_capable_downloader_interface; pub mod vcs_downloader; pub mod xz_downloader; pub mod zip_downloader; + +pub use archive_downloader::*; +pub use change_report_interface::*; +pub use download_manager::*; +pub use downloader_interface::*; +pub use dvcs_downloader_interface::*; +pub use file_downloader::*; +pub use filesystem_exception::*; +pub use fossil_downloader::*; +pub use git_downloader::*; +pub use gzip_downloader::*; +pub use hg_downloader::*; +pub use max_file_size_exceeded_exception::*; +pub use path_downloader::*; +pub use perforce_downloader::*; +pub use phar_downloader::*; +pub use rar_downloader::*; +pub use svn_downloader::*; +pub use tar_downloader::*; +pub use transport_exception::*; +pub use vcs_capable_downloader_interface::*; +pub use vcs_downloader::*; +pub use xz_downloader::*; +pub use zip_downloader::*; diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs index 56ecf0f..126b521 100644 --- a/crates/shirabe/src/downloader/path_downloader.rs +++ b/crates/shirabe/src/downloader/path_downloader.rs @@ -3,9 +3,9 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::filesystem::exception::io_exception::IOException; -use shirabe_external_packages::symfony::component::filesystem::filesystem::Filesystem as SymfonyFilesystem; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::filesystem::Filesystem as SymfonyFilesystem; +use shirabe_external_packages::symfony::component::filesystem::exception::IOException; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, PHP_WINDOWS_VERSION_MAJOR, PHP_WINDOWS_VERSION_MINOR, PhpMixed, RuntimeException, file_exists, function_exists, is_dir, realpath, @@ -13,22 +13,22 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::downloader::VcsCapableDownloaderInterface; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::dumper::ArrayDumper; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct PathDownloader { diff --git a/crates/shirabe/src/downloader/perforce_downloader.rs b/crates/shirabe/src/downloader/perforce_downloader.rs index b2d05dd..02e32b4 100644 --- a/crates/shirabe/src/downloader/perforce_downloader.rs +++ b/crates/shirabe/src/downloader/perforce_downloader.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Downloader/PerforceDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::vcs_repository::VcsRepository; -use crate::util::filesystem::Filesystem; -use crate::util::perforce::Perforce; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::VcsRepository; +use crate::util::Filesystem; +use crate::util::Perforce; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PhpMixed; use std::any::Any; diff --git a/crates/shirabe/src/downloader/phar_downloader.rs b/crates/shirabe/src/downloader/phar_downloader.rs index f6c15b8..c805bb3 100644 --- a/crates/shirabe/src/downloader/phar_downloader.rs +++ b/crates/shirabe/src/downloader/phar_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::Phar; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/rar_downloader.rs b/crates/shirabe/src/downloader/rar_downloader.rs index 0366e28..d798664 100644 --- a/crates/shirabe/src/downloader/rar_downloader.rs +++ b/crates/shirabe/src/downloader/rar_downloader.rs @@ -2,19 +2,19 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::ini_helper::IniHelper; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::IniHelper; +use crate::util::Platform; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ PhpMixed, RarArchive, RuntimeException, UnexpectedValueException, class_exists, implode, }; @@ -144,7 +144,7 @@ impl RarDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for RarDownloader { +impl crate::downloader::DownloaderInterface for RarDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index 5b20ff8..56eb891 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -2,20 +2,20 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_external_packages::react::promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, is_dir, version_compare}; use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::vcs_repository::VcsRepository; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::VcsRepository; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; #[derive(Debug)] pub struct SvnDownloader { diff --git a/crates/shirabe/src/downloader/tar_downloader.rs b/crates/shirabe/src/downloader/tar_downloader.rs index 10d2614..a21e94d 100644 --- a/crates/shirabe/src/downloader/tar_downloader.rs +++ b/crates/shirabe/src/downloader/tar_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PharData; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs b/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs index 6176704..68e9caa 100644 --- a/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs +++ b/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/VcsCapableDownloaderInterface.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait VcsCapableDownloaderInterface { fn get_vcs_reference(&self, package: &dyn PackageInterface, path: String) -> Option<String>; diff --git a/crates/shirabe/src/downloader/vcs_downloader.rs b/crates/shirabe/src/downloader/vcs_downloader.rs index cc8f9fb..1f041bd 100644 --- a/crates/shirabe/src/downloader/vcs_downloader.rs +++ b/crates/shirabe/src/downloader/vcs_downloader.rs @@ -3,7 +3,7 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_map, array_shift, count, explode, get_class, get_class_err, implode, rawurldecode, realpath, str_replace, strlen, strpos, substr, @@ -11,19 +11,19 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::downloader::change_report_interface::ChangeReportInterface; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface; -use crate::io::io_interface::IOInterface; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::ChangeReportInterface; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsCapableDownloaderInterface; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct VcsDownloaderBase { diff --git a/crates/shirabe/src/downloader/xz_downloader.rs b/crates/shirabe/src/downloader/xz_downloader.rs index a16341c..e90b263 100644 --- a/crates/shirabe/src/downloader/xz_downloader.rs +++ b/crates/shirabe/src/downloader/xz_downloader.rs @@ -2,17 +2,17 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::{Result, bail}; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] @@ -78,7 +78,7 @@ impl XzDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for XzDownloader { +impl crate::downloader::DownloaderInterface for XzDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index 835c118..7cd5000 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Downloader/ZipDownloader.php -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::package::package_interface::PackageInterface; -use crate::util::ini_helper::IniHelper; -use crate::util::platform::Platform; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::package::PackageInterface; +use crate::util::IniHelper; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, ErrorException, RuntimeException, UnexpectedValueException, ZipArchive, bin2hex, class_exists, file_exists, file_get_contents, filesize, function_exists, hash_file, @@ -33,19 +33,15 @@ pub struct ZipDownloader { impl ZipDownloader { pub fn new( - io: Box<dyn crate::io::io_interface::IOInterface>, + io: Box<dyn crate::io::IOInterface>, config: std::rc::Rc<std::cell::RefCell<crate::config::Config>>, - http_downloader: std::rc::Rc< - std::cell::RefCell<crate::util::http_downloader::HttpDownloader>, - >, + http_downloader: std::rc::Rc<std::cell::RefCell<crate::util::HttpDownloader>>, event_dispatcher: Option< - std::rc::Rc< - std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>, - >, + std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::EventDispatcher>>, >, cache: Option<crate::cache::Cache>, - filesystem: std::rc::Rc<std::cell::RefCell<crate::util::filesystem::Filesystem>>, - process: std::rc::Rc<std::cell::RefCell<crate::util::process_executor::ProcessExecutor>>, + filesystem: std::rc::Rc<std::cell::RefCell<crate::util::Filesystem>>, + process: std::rc::Rc<std::cell::RefCell<crate::util::ProcessExecutor>>, ) -> Self { Self { inner: FileDownloader::new( @@ -426,7 +422,7 @@ impl ZipDownloader { // TODO(phase-b): ZipDownloader::download is overridden with extra setup (UNZIP_COMMANDS init, // etc.). The trait method here delegates straight to the inner FileDownloader; the bespoke // override on the struct itself takes &mut self and is not yet routed through the trait. -impl crate::downloader::downloader_interface::DownloaderInterface for ZipDownloader { +impl crate::downloader::DownloaderInterface for ZipDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } |