From eea4efe87e455742ec17881ee93d8095925e8516 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Thu, 28 May 2026 22:43:11 +0900 Subject: refactor(repository): introduce Rc> handles for repositories Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/repository/repository_utils.rs | 32 ++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/src/repository/repository_utils.rs') diff --git a/crates/shirabe/src/repository/repository_utils.rs b/crates/shirabe/src/repository/repository_utils.rs index 667cea2..4522039 100644 --- a/crates/shirabe/src/repository/repository_utils.rs +++ b/crates/shirabe/src/repository/repository_utils.rs @@ -3,7 +3,7 @@ use crate::package::Link; use crate::repository::CompositeRepository; use crate::repository::FilterRepository; -use crate::repository::RepositoryInterface; +use crate::repository::RepositoryInterfaceHandle; use indexmap::IndexMap; use std::any::Any; @@ -39,23 +39,31 @@ impl RepositoryUtils { } pub fn flatten_repositories( - repo: Box, + repo: RepositoryInterfaceHandle, unwrap_filter_repos: bool, - ) -> Vec> { - let repo: Box = if unwrap_filter_repos { - if let Some(filter_repo) = repo.as_any().downcast_ref::() { - filter_repo.get_repository().clone_box() - } else { - repo - } + ) -> Vec { + let repo: RepositoryInterfaceHandle = if unwrap_filter_repos { + let unwrapped = { + let r = repo.borrow(); + r.as_any() + .downcast_ref::() + .map(|filter_repo| filter_repo.get_repository()) + }; + unwrapped.unwrap_or(repo) } else { repo }; - if let Some(composite_repo) = repo.as_any().downcast_ref::() { + let nested = { + let r = repo.borrow(); + r.as_any() + .downcast_ref::() + .map(|composite_repo| composite_repo.get_repositories().clone()) + }; + if let Some(nested) = nested { let mut repos = Vec::new(); - for r in composite_repo.get_repositories() { - for r2 in Self::flatten_repositories(r.clone_box(), unwrap_filter_repos) { + for r in nested { + for r2 in Self::flatten_repositories(r, unwrap_filter_repos) { repos.push(r2); } } -- cgit v1.3.1