aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/archiver/zip_archiver.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-06 14:29:50 +0900
committernsfisis <nsfisis@gmail.com>2026-06-06 14:29:50 +0900
commite89e1785e3df047a869c48b91709289a3b145b49 (patch)
treee7ae86b6657821cf32bd1c4244d1c374af1ce911 /crates/shirabe/src/package/archiver/zip_archiver.rs
parent558c22c072d7e7e77e0e5e3493a71727301f7c73 (diff)
downloadphp-shirabe-e89e1785e3df047a869c48b91709289a3b145b49.tar.gz
php-shirabe-e89e1785e3df047a869c48b91709289a3b145b49.tar.zst
php-shirabe-e89e1785e3df047a869c48b91709289a3b145b49.zip
refactor(archiver): yield PathBuf from ArchivableFilesFinder, drop SplFileInfo
Migrate ArchivableFilesFinder off Symfony's SplFileInfo onto Path/PathBuf, resolving the phar_archiver TODO(phase-b) that required a .map() adapter to bridge SplFileInfo -> PathBuf. - ArchivableFilesFinder now yields PathBuf; accept() takes &Path; the exclude closure receives &Path and uses Path::canonicalize / is_symlink. The SplFileInfo -> PathBuf conversion happens once at the symfony get_iterator boundary (get_iterator stays SplFileInfo for cache.rs). - symfony Finder::filter callback changed to FnMut(&Path) (sole caller is the finder). - PharArchiver passes the finder straight into ArchivableFilesFilter, mirroring PHP's new ArchivableFilesFilter($files). - ZipArchiver consumes PathBuf items, computing the relative path via strip_prefix(sources) in place of SplFileInfo::getRelativePathname. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package/archiver/zip_archiver.rs')
-rw-r--r--crates/shirabe/src/package/archiver/zip_archiver.rs27
1 files changed, 19 insertions, 8 deletions
diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs
index 79d714b..7d9f126 100644
--- a/crates/shirabe/src/package/archiver/zip_archiver.rs
+++ b/crates/shirabe/src/package/archiver/zip_archiver.rs
@@ -8,6 +8,7 @@ use indexmap::IndexMap;
use shirabe_php_shim::{
PhpMixed, RuntimeException, ZipArchive, class_exists, fileperms, method_exists, pack, realpath,
};
+use std::path::PathBuf;
#[derive(Debug)]
pub struct ZipArchiver;
@@ -50,24 +51,34 @@ impl ArchiverInterface for ZipArchiver {
if zip.open(&target, ZipArchive::CREATE).is_ok() {
let files = ArchivableFilesFinder::new(&sources, excludes, ignore_filters)?;
for file in files {
- let filepath = file.get_pathname();
- let mut relative_path = file.get_relative_path_name();
+ let filepath = file;
+ let mut relative_path = filepath
+ .strip_prefix(&sources)
+ .unwrap_or(filepath.as_path())
+ .to_path_buf();
if Platform::is_windows() {
- relative_path = shirabe_php_shim::strtr(&relative_path, "\\", "/");
+ relative_path = PathBuf::from(shirabe_php_shim::strtr(
+ &relative_path.to_string_lossy(),
+ "\\",
+ "/",
+ ));
}
- if file.is_dir() {
- zip.add_empty_dir(&relative_path);
+ if filepath.is_dir() {
+ zip.add_empty_dir(&relative_path.to_string_lossy());
} else {
- zip.add_file(&filepath, &relative_path);
+ zip.add_file(
+ &filepath.to_string_lossy(),
+ &relative_path.to_string_lossy(),
+ );
}
// setExternalAttributesName() is only available with libzip 0.11.2 or above
if method_exists(&PhpMixed::Null, "setExternalAttributesName") {
- let perms = fileperms(&filepath);
+ let perms = fileperms(&filepath.to_string_lossy());
zip.set_external_attributes_name(
- &relative_path,
+ &relative_path.to_string_lossy(),
ZipArchive::OPSYS_UNIX,
perms << 16,
);