From c028a9d5c737de5d2b259638a0a76b999364a262 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 6 Jun 2026 22:40:30 +0900 Subject: feat(vcs): implement VcsDriverInterface for all VCS drivers Reconcile the VcsDriverInterface trait with the concrete drivers so every driver implements it as in PHP, where each driver extends VcsDriver. - Make cache-mutating getters take &mut self in the trait, matching the inherent methods' lazy-cache semantics; update vcs_repository consumers. - Change supports() to take Rc> and return Result, completing GitDriver::supports deep ls-remote and its config wiring. - Add base get_composer_information to Git/Hg/Fossil/Perforce and an impl VcsDriverInterface block to every driver, delegating to inherent methods and absorbing type differences in the impl. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/repository/vcs/git_bitbucket_driver.rs | 81 ++++++++++++++++++++-- 1 file changed, 76 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs') diff --git a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs index 644ac90..2a8d374 100644 --- a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs @@ -858,17 +858,17 @@ impl GitBitbucketDriver { /// @inheritDoc pub fn supports( io: std::rc::Rc>, - _config: &Config, + _config: std::rc::Rc>, url: &str, _deep: bool, - ) -> bool { + ) -> anyhow::Result { if !Preg::is_match( r"#^https?://bitbucket\.org/([^/]+)/([^/]+?)(\.git|/?)?$#i", url, ) .unwrap_or(false) { - return false; + return Ok(false); } if !extension_loaded("openssl") { @@ -881,9 +881,80 @@ impl GitBitbucketDriver { // PHP: writeError(..., true, io_interface::VERBOSE) // TODO(phase-b): io_interface::VERBOSE verbosity argument - return false; + return Ok(false); + } + + Ok(true) + } +} + +impl crate::repository::vcs::VcsDriverInterface for GitBitbucketDriver { + fn initialize(&mut self) -> anyhow::Result<()> { + GitBitbucketDriver::initialize(self) + } + + fn get_composer_information( + &mut self, + identifier: &str, + ) -> anyhow::Result>> { + GitBitbucketDriver::get_composer_information(self, identifier) + } + + fn get_file_content(&mut self, file: &str, identifier: &str) -> anyhow::Result> { + GitBitbucketDriver::get_file_content(self, file, identifier) + } + + fn get_change_date(&mut self, identifier: &str) -> anyhow::Result>> { + GitBitbucketDriver::get_change_date(self, identifier) + } + + fn get_root_identifier(&mut self) -> anyhow::Result { + GitBitbucketDriver::get_root_identifier(self) + } + + fn get_branches(&mut self) -> anyhow::Result> { + GitBitbucketDriver::get_branches(self) + } + + fn get_tags(&mut self) -> anyhow::Result> { + GitBitbucketDriver::get_tags(self) + } + + fn get_dist(&self, identifier: &str) -> anyhow::Result>> { + Ok(GitBitbucketDriver::get_dist(self, identifier)) + } + + fn get_source(&self, identifier: &str) -> anyhow::Result> { + Ok(GitBitbucketDriver::get_source(self, identifier)) + } + + fn get_url(&self) -> String { + GitBitbucketDriver::get_url(self) + } + + fn has_composer_file(&mut self, identifier: &str) -> anyhow::Result { + match self.get_composer_information(identifier) { + Ok(info) => Ok(info.is_some()), + Err(e) => { + if e.downcast_ref::().is_some() { + Ok(false) + } else { + Err(e) + } + } } + } - true + fn cleanup(&mut self) -> anyhow::Result<()> { + Ok(()) + } + + fn supports( + io: std::rc::Rc>, + config: std::rc::Rc>, + url: &str, + deep: bool, + ) -> anyhow::Result { + GitBitbucketDriver::supports(io, config, url, deep) } } -- cgit v1.3.1