aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/downloader/download_manager.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-07-18 18:03:57 +0900
committernsfisis <nsfisis@gmail.com>2026-07-18 18:03:57 +0900
commit9b291d454b059977639db26c847af4e835cda0c3 (patch)
treee54770570a80e67681f1614841156b864452713c /crates/shirabe/src/downloader/download_manager.rs
parentf8e385f7a1bd752d39f4d4f87b0439596839dde9 (diff)
downloadphp-shirabe-9b291d454b059977639db26c847af4e835cda0c3.tar.gz
php-shirabe-9b291d454b059977639db26c847af4e835cda0c3.tar.zst
php-shirabe-9b291d454b059977639db26c847af4e835cda0c3.zip
refactor(downloader): take &self across the downloader hierarchy
Concurrent package operations call into the same downloader instances through Rc<RefCell<dyn DownloaderInterface>>; with &mut self methods every call holds a RefMut across its awaits, which panics with 'already mutably borrowed' the moment two operations overlap. This is groundwork for fanning out InstallationManager's download/install loops (same rework HttpDownloader/CurlDownloader already got). - DownloaderInterface/ChangeReportInterface/ArchiveDownloader/ VcsDownloader methods now take &self; as_change_report_interface returns &dyn instead of &mut dyn. - Implementors move their genuinely mutable state behind cells: FileDownloader.additional_cleanup_paths, the archive downloaders' cleanup_executed, ZipDownloader.zip_archive_object, VcsDownloaderBase.has_cleaned_changes, GitDownloader's stash/discard/ cache maps and GitUtil, SvnDownloader.cache_credentials, PerforceDownloader.perforce. FileDownloader.io gains a RefCell layer so get_local_changes can keep PHP's NullIO swap under &self. - ProcessExecutor::execute_async now returns a future that captures everything up front instead of borrowing the executor, and call sites build the future before awaiting, so no borrow on the shared executor is held while a subprocess runs. - Filesystem::remove_directory_async becomes remove_directory_async_via taking the Rc handle: the Filesystem is only borrowed for the sync head/tail, never across the rm subprocess await (sync borrow_mut users like rename/ensure_directory_exists would otherwise collide). - DownloadManager async call sites hold shared borrows only. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/downloader/download_manager.rs')
-rw-r--r--crates/shirabe/src/downloader/download_manager.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs
index 466570eb..7ecdfd96 100644
--- a/crates/shirabe/src/downloader/download_manager.rs
+++ b/crates/shirabe/src/downloader/download_manager.rs
@@ -222,7 +222,7 @@ impl DownloadManager {
};
let result = match downloader
- .borrow_mut()
+ .borrow()
.download3(package.clone(), &target_dir, prev_package.clone())
.await
{
@@ -281,7 +281,7 @@ impl DownloadManager {
let target_dir = self.normalize_target_dir(target_dir);
if let Some(downloader) = self.get_downloader_for_package(package.clone())? {
return downloader
- .borrow_mut()
+ .borrow()
.prepare(r#type, package, &target_dir, prev_package)
.await;
}
@@ -304,7 +304,7 @@ impl DownloadManager {
) -> anyhow::Result<Option<PhpMixed>> {
let target_dir = self.normalize_target_dir(target_dir);
if let Some(downloader) = self.get_downloader_for_package(package.clone())? {
- return downloader.borrow_mut().install2(package, &target_dir).await;
+ return downloader.borrow().install2(package, &target_dir).await;
}
Ok(None)
@@ -338,7 +338,7 @@ impl DownloadManager {
return initial_downloader
.as_ref()
.unwrap()
- .borrow_mut()
+ .borrow()
.remove2(initial, &target_dir)
.await;
}
@@ -349,7 +349,7 @@ impl DownloadManager {
match downloader
.as_ref()
.unwrap()
- .borrow_mut()
+ .borrow()
.update(initial.clone(), target.clone(), &target_dir)
.await
{
@@ -388,7 +388,7 @@ impl DownloadManager {
let _ = initial_downloader
.as_ref()
.unwrap()
- .borrow_mut()
+ .borrow()
.remove2(initial, &target_dir)
.await?;
self.install(target, &target_dir).await
@@ -406,7 +406,7 @@ impl DownloadManager {
) -> anyhow::Result<Option<PhpMixed>> {
let target_dir = self.normalize_target_dir(target_dir);
if let Some(downloader) = self.get_downloader_for_package(package.clone())? {
- return downloader.borrow_mut().remove2(package, &target_dir).await;
+ return downloader.borrow().remove2(package, &target_dir).await;
}
Ok(None)
@@ -429,7 +429,7 @@ impl DownloadManager {
let target_dir = self.normalize_target_dir(target_dir);
if let Some(downloader) = self.get_downloader_for_package(package.clone())? {
return downloader
- .borrow_mut()
+ .borrow()
.cleanup(r#type, package, &target_dir, prev_package)
.await;
}