From cd25c3e193f05a5e89bca2a1c706c85fdc9c9155 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 02:13:59 +0900 Subject: refactor(repository): make read methods fallible and take &mut self Change RepositoryInterface and WritableRepositoryInterface read methods (find_package, find_packages, get_packages, load_packages, search, get_providers, get_canonical_packages) to take &mut self and return anyhow::Result, so lazy-loading repositories such as ComposerRepository can perform fallible I/O and mutate internal state on access. Update all implementors and call sites to propagate the Result and pass mutable references. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../shirabe/src/repository/composite_repository.rs | 54 +++++++++++++--------- 1 file changed, 31 insertions(+), 23 deletions(-) (limited to 'crates/shirabe/src/repository/composite_repository.rs') diff --git a/crates/shirabe/src/repository/composite_repository.rs b/crates/shirabe/src/repository/composite_repository.rs index 6c167f2..78bbc6a 100644 --- a/crates/shirabe/src/repository/composite_repository.rs +++ b/crates/shirabe/src/repository/composite_repository.rs @@ -84,46 +84,46 @@ impl RepositoryInterface for CompositeRepository { } fn find_package( - &self, + &mut self, name: &str, constraint: FindPackageConstraint, - ) -> Option { + ) -> anyhow::Result> { for repository in &self.repositories { - let package = repository.find_package(name, constraint.clone()); + let package = repository.find_package(name, constraint.clone())?; if package.is_some() { - return package; + return Ok(package); } } - None + Ok(None) } fn find_packages( - &self, + &mut self, name: &str, constraint: Option, - ) -> Vec { + ) -> anyhow::Result> { let mut packages = vec![]; for repository in &self.repositories { - packages.extend(repository.find_packages(name, constraint.clone())); + packages.extend(repository.find_packages(name, constraint.clone())?); } - packages + Ok(packages) } - fn get_packages(&self) -> Vec { + fn get_packages(&mut self) -> anyhow::Result> { let mut packages = vec![]; for repository in &self.repositories { - packages.extend(repository.get_packages()); + packages.extend(repository.get_packages()?); } - packages + Ok(packages) } fn load_packages( - &self, + &mut self, package_name_map: IndexMap>, acceptable_stabilities: IndexMap, stability_flags: IndexMap, already_loaded: IndexMap>, - ) -> LoadPackagesResult { + ) -> anyhow::Result { let mut all_packages = IndexMap::new(); let mut all_names_found = vec![]; @@ -137,7 +137,7 @@ impl RepositoryInterface for CompositeRepository { acceptable_stabilities.clone(), stability_flags.clone(), already_loaded.clone(), - ); + )?; all_packages.extend(result.packages); all_names_found.extend(result.names_found); } @@ -148,26 +148,34 @@ impl RepositoryInterface for CompositeRepository { .filter(|s| seen.insert(s.clone())) .collect(); - LoadPackagesResult { + Ok(LoadPackagesResult { packages: all_packages, names_found: unique_names, - } + }) } - fn search(&self, query: String, mode: i64, r#type: Option) -> Vec { + fn search( + &mut self, + query: String, + mode: i64, + r#type: Option, + ) -> anyhow::Result> { let mut matches = vec![]; for repository in &self.repositories { - matches.extend(repository.search(query.clone(), mode, r#type.clone())); + matches.extend(repository.search(query.clone(), mode, r#type.clone())?); } - matches + Ok(matches) } - fn get_providers(&self, package_name: String) -> IndexMap { + fn get_providers( + &mut self, + package_name: String, + ) -> anyhow::Result> { let mut results = IndexMap::new(); for repository in &self.repositories { - results.extend(repository.get_providers(package_name.clone())); + results.extend(repository.get_providers(package_name.clone())?); } - results + Ok(results) } fn as_any(&self) -> &dyn std::any::Any { -- cgit v1.3.1