aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crates/shirabe/src/downloader/file_downloader.rs55
-rw-r--r--crates/shirabe/src/downloader/gzip_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/path_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/phar_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/rar_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/tar_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/xz_downloader.rs7
-rw-r--r--crates/shirabe/src/downloader/zip_downloader.rs7
8 files changed, 79 insertions, 25 deletions
diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs
index bb5c9705..19ce8b4a 100644
--- a/crates/shirabe/src/downloader/file_downloader.rs
+++ b/crates/shirabe/src/downloader/file_downloader.rs
@@ -569,15 +569,9 @@ impl DownloaderInterface for FileDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.io.borrow().write_error(&format!(
- " - {}{}",
- UpdateOperation::format(initial.clone(), target.clone(), false),
- self.get_install_operation_appendix(target.clone(), path)
- ));
-
- // PHP: return $this->remove($initial, $path, false)->then(fn () => $this->install($target, $path, false));
- let _ = self.remove(initial, path, false).await?;
- self.install(target, path, false).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.base_update(self, &appendix, initial, target, path)
+ .await
}
/// @inheritDoc
@@ -614,6 +608,23 @@ impl ChangeReportInterface for FileDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
+ self.base_get_local_changes(self, package, path)
+ }
+}
+
+impl FileDownloader {
+ /// Shared body of `ChangeReportInterface::get_local_changes`.
+ ///
+ /// PHP's `getLocalChanges` calls `$this->download()` / `$this->install()`, which late-bind
+ /// to the concrete downloader class (e.g. `ArchiveDownloader::install` extracts the archive
+ /// instead of copying the dist file). The Rust port embeds the parent class as `inner`, so
+ /// delegating downloaders must pass themselves as `this` to preserve that dispatch.
+ pub(crate) fn base_get_local_changes(
+ &self,
+ this: &dyn DownloaderInterface,
+ package: PackageInterfaceHandle,
+ path: &str,
+ ) -> anyhow::Result<Option<String>> {
let prev_io = std::mem::replace(
&mut *self.io.borrow_mut(),
std::rc::Rc::new(std::cell::RefCell::new(NullIO::new())),
@@ -634,13 +645,13 @@ impl ChangeReportInterface for FileDownloader {
.remove_directory(format!("{}_compare", target_dir))?;
}
- sync_executor::block_on(self.download(
+ sync_executor::block_on(this.download(
package.clone(),
&format!("{}_compare", target_dir),
None,
false,
))?;
- sync_executor::block_on(self.install(
+ sync_executor::block_on(this.install(
package.clone(),
&format!("{}_compare", target_dir),
false,
@@ -684,6 +695,28 @@ impl ChangeReportInterface for FileDownloader {
None
})
}
+
+ /// Shared body of `DownloaderInterface::update`; see `base_get_local_changes` for why the
+ /// concrete downloader is threaded in as `this`. The appendix is computed by the caller
+ /// because `getInstallOperationAppendix` is protected and not part of `DownloaderInterface`.
+ pub(crate) async fn base_update(
+ &self,
+ this: &dyn DownloaderInterface,
+ install_operation_appendix: &str,
+ initial: PackageInterfaceHandle,
+ target: PackageInterfaceHandle,
+ path: &str,
+ ) -> anyhow::Result<Option<PhpMixed>> {
+ self.io.borrow().write_error(&format!(
+ " - {}{}",
+ UpdateOperation::format(initial.clone(), target.clone(), false),
+ install_operation_appendix
+ ));
+
+ // PHP: return $this->remove($initial, $path, false)->then(fn () => $this->install($target, $path, false));
+ let _ = this.remove(initial, path, false).await?;
+ this.install(target, path, false).await
+ }
}
impl FileDownloader {
diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs
index 6b5f3872..70b9f7bb 100644
--- a/crates/shirabe/src/downloader/gzip_downloader.rs
+++ b/crates/shirabe/src/downloader/gzip_downloader.rs
@@ -146,7 +146,7 @@ impl ChangeReportInterface for GzipDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -197,7 +197,10 @@ impl crate::downloader::DownloaderInterface for GzipDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs
index 1f5498ad..72b77fc1 100644
--- a/crates/shirabe/src/downloader/path_downloader.rs
+++ b/crates/shirabe/src/downloader/path_downloader.rs
@@ -213,7 +213,7 @@ impl crate::downloader::ChangeReportInterface for PathDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -493,7 +493,10 @@ impl DownloaderInterface for PathDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path)?;
+ self.inner
+ .base_update(self, &appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/phar_downloader.rs b/crates/shirabe/src/downloader/phar_downloader.rs
index b33fa74a..32ac0b3f 100644
--- a/crates/shirabe/src/downloader/phar_downloader.rs
+++ b/crates/shirabe/src/downloader/phar_downloader.rs
@@ -79,7 +79,7 @@ impl ChangeReportInterface for PharDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -130,7 +130,10 @@ impl DownloaderInterface for PharDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/rar_downloader.rs b/crates/shirabe/src/downloader/rar_downloader.rs
index 7eaa5a8c..39ffc23b 100644
--- a/crates/shirabe/src/downloader/rar_downloader.rs
+++ b/crates/shirabe/src/downloader/rar_downloader.rs
@@ -159,7 +159,7 @@ impl ChangeReportInterface for RarDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -210,7 +210,10 @@ impl crate::downloader::DownloaderInterface for RarDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/tar_downloader.rs b/crates/shirabe/src/downloader/tar_downloader.rs
index ae600971..a4446287 100644
--- a/crates/shirabe/src/downloader/tar_downloader.rs
+++ b/crates/shirabe/src/downloader/tar_downloader.rs
@@ -74,7 +74,7 @@ impl ChangeReportInterface for TarDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -125,7 +125,10 @@ impl DownloaderInterface for TarDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/xz_downloader.rs b/crates/shirabe/src/downloader/xz_downloader.rs
index d3defae5..2041c356 100644
--- a/crates/shirabe/src/downloader/xz_downloader.rs
+++ b/crates/shirabe/src/downloader/xz_downloader.rs
@@ -94,7 +94,7 @@ impl ChangeReportInterface for XzDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -145,7 +145,10 @@ impl crate::downloader::DownloaderInterface for XzDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs
index f70846e4..d8f7d05e 100644
--- a/crates/shirabe/src/downloader/zip_downloader.rs
+++ b/crates/shirabe/src/downloader/zip_downloader.rs
@@ -454,7 +454,7 @@ impl ChangeReportInterface for ZipDownloader {
package: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<String>> {
- self.inner.get_local_changes(package, path)
+ self.inner.base_get_local_changes(self, package, path)
}
}
@@ -632,7 +632,10 @@ impl crate::downloader::DownloaderInterface for ZipDownloader {
target: PackageInterfaceHandle,
path: &str,
) -> anyhow::Result<Option<PhpMixed>> {
- self.inner.update(initial, target, path).await
+ let appendix = self.get_install_operation_appendix(target.clone(), path);
+ self.inner
+ .base_update(self, appendix, initial, target, path)
+ .await
}
async fn remove(
generated by cgit v1.3.1 (git 2.54.0) at 2026-09-04 07:53:12 +0000