From c5bcf222f98d13b104231713bf4a0aa0833c420a Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 5 Jun 2026 00:50:47 +0900 Subject: feat(downloader): wire VcsDownloader subclasses via shared downloaders Share downloaders as Rc> in DownloadManager and make DownloaderInterface/VcsDownloader take &mut self, matching PHP's mutable-by-reference downloader objects. This lets Git/Svn/Hg/Fossil/Perforce implement VcsDownloader and route download/install/update/prepare/cleanup through the trait instead of todo!(), and wires the as_* downcast hooks end-to-end. ChangeReportInterface::get_local_changes becomes &mut self since FileDownloader downloads to a compare dir; get_commit_logs/reapply_changes gain &mut self / Result to match the concrete implementations. Co-Authored-By: Claude Opus 4.8 --- crates/shirabe/src/util/sync_helper.rs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/util') diff --git a/crates/shirabe/src/util/sync_helper.rs b/crates/shirabe/src/util/sync_helper.rs index 4181b23..6220f5c 100644 --- a/crates/shirabe/src/util/sync_helper.rs +++ b/crates/shirabe/src/util/sync_helper.rs @@ -8,7 +8,7 @@ use anyhow::Result; use shirabe_php_shim::PhpMixed; pub enum DownloaderOrManager<'a> { - Interface(&'a dyn DownloaderInterface), + Interface(&'a std::rc::Rc>), Manager(&'a std::rc::Rc>), } @@ -20,7 +20,7 @@ impl<'a> DownloaderOrManager<'a> { prev_package: Option, ) -> Result> { match self { - Self::Interface(d) => d.download3(package, path, prev_package).await, + Self::Interface(d) => d.borrow_mut().download3(package, path, prev_package).await, Self::Manager(d) => d.borrow().download(package, path, prev_package).await, } } @@ -33,7 +33,11 @@ impl<'a> DownloaderOrManager<'a> { prev_package: Option, ) -> Result> { match self { - Self::Interface(d) => d.prepare(r#type, package, path, prev_package).await, + Self::Interface(d) => { + d.borrow_mut() + .prepare(r#type, package, path, prev_package) + .await + } Self::Manager(d) => { d.borrow() .prepare(r#type, package, path, prev_package) @@ -48,7 +52,7 @@ impl<'a> DownloaderOrManager<'a> { path: &str, ) -> Result> { match self { - Self::Interface(d) => d.install2(package, path).await, + Self::Interface(d) => d.borrow_mut().install2(package, path).await, Self::Manager(d) => d.borrow().install(package, path).await, } } @@ -60,7 +64,7 @@ impl<'a> DownloaderOrManager<'a> { path: &str, ) -> Result> { match self { - Self::Interface(d) => d.update(package, prev_package, path).await, + Self::Interface(d) => d.borrow_mut().update(package, prev_package, path).await, Self::Manager(d) => d.borrow().update(package, prev_package, path).await, } } @@ -73,7 +77,11 @@ impl<'a> DownloaderOrManager<'a> { prev_package: Option, ) -> Result> { match self { - Self::Interface(d) => d.cleanup(r#type, package, path, prev_package).await, + Self::Interface(d) => { + d.borrow_mut() + .cleanup(r#type, package, path, prev_package) + .await + } Self::Manager(d) => { d.borrow() .cleanup(r#type, package, path, prev_package) -- cgit v1.3.1