aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/archiver
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/package/archiver')
-rw-r--r--crates/shirabe/src/package/archiver/archive_manager.rs13
-rw-r--r--crates/shirabe/src/package/archiver/mod.rs19
-rw-r--r--crates/shirabe/src/package/archiver/phar_archiver.rs7
3 files changed, 9 insertions, 30 deletions
diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs
index be911d6..eaeab9c 100644
--- a/crates/shirabe/src/package/archiver/archive_manager.rs
+++ b/crates/shirabe/src/package/archiver/archive_manager.rs
@@ -1,12 +1,5 @@
//! ref: composer/src/Composer/Package/Archiver/ArchiveManager.php
-use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::Preg;
-use shirabe_php_shim::{
- InvalidArgumentException, RuntimeException, bin2hex, file_exists, random_bytes, realpath,
- sys_get_temp_dir,
-};
-
use crate::downloader::DownloadManager;
use crate::json::JsonFile;
use crate::package::CompletePackageInterfaceHandle;
@@ -16,6 +9,12 @@ use crate::package::archiver::ZipArchiver;
use crate::util::Filesystem;
use crate::util::SyncHelper;
use crate::util::r#loop::Loop;
+use indexmap::IndexMap;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_php_shim::{
+ InvalidArgumentException, RuntimeException, bin2hex, file_exists, random_bytes, realpath,
+ sys_get_temp_dir,
+};
pub struct ArchiveManager {
pub(crate) download_manager: std::rc::Rc<std::cell::RefCell<DownloadManager>>,
diff --git a/crates/shirabe/src/package/archiver/mod.rs b/crates/shirabe/src/package/archiver/mod.rs
deleted file mode 100644
index b4df5b0..0000000
--- a/crates/shirabe/src/package/archiver/mod.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-pub mod archivable_files_filter;
-pub mod archivable_files_finder;
-pub mod archive_manager;
-pub mod archiver_interface;
-pub mod base_exclude_filter;
-pub mod composer_exclude_filter;
-pub mod git_exclude_filter;
-pub mod phar_archiver;
-pub mod zip_archiver;
-
-pub use archivable_files_filter::*;
-pub use archivable_files_finder::*;
-pub use archive_manager::*;
-pub use archiver_interface::*;
-pub use base_exclude_filter::*;
-pub use composer_exclude_filter::*;
-pub use git_exclude_filter::*;
-pub use phar_archiver::*;
-pub use zip_archiver::*;
diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs
index c25b90b..1bac060 100644
--- a/crates/shirabe/src/package/archiver/phar_archiver.rs
+++ b/crates/shirabe/src/package/archiver/phar_archiver.rs
@@ -1,15 +1,14 @@
//! ref: composer/src/Composer/Package/Archiver/PharArchiver.php
+use crate::package::archiver::ArchivableFilesFilter;
+use crate::package::archiver::ArchivableFilesFinder;
+use crate::package::archiver::ArchiverInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{
FilesystemIterator, Phar, PharData, PhpMixed, RuntimeException, bzcompress, file_exists,
file_put_contents, function_exists, gzcompress, pack, str_repeat, strrpos, unlink,
};
-use crate::package::archiver::ArchivableFilesFilter;
-use crate::package::archiver::ArchivableFilesFinder;
-use crate::package::archiver::ArchiverInterface;
-
fn formats() -> IndexMap<&'static str, i64> {
let mut m = IndexMap::new();
m.insert("zip", Phar::ZIP);