cleanup

TabbyML · Sep 23, 2024 · c104641 · c104641
1 parent 51e020e
commit c104641
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/ee/tabby-schema/src/schema/context.rs b/ee/tabby-schema/src/schema/context.rs
@@ -98,29 +98,34 @@ impl ContextInfo {
     pub fn helper(&self) -> ContextInfoHelper {
         ContextInfoHelper::new(self)
     }
+
+    pub fn allowed_code_repository(&self) -> AllowedCodeRepository {
+        let mut repositories = vec![];
+        repositories.reserve(self.sources.len());
+        for x in &self.sources {
+            if let ContextSourceValueEnum::Repository(x) = x {
+                repositories.push(CodeRepository::new(&x.git_url, &x.source_id));
+            }
+        }
+
+        AllowedCodeRepository::new(repositories)
+    }
 }
 
 pub struct ContextInfoHelper {
     sources: HashMap<String, String>,
-    pub allowed_code_repository: AllowedCodeRepository,
+    allowed_code_repository: AllowedCodeRepository,
 }
 
 impl ContextInfoHelper {
     pub fn new(context_info: &ContextInfo) -> Self {
-        let mut repositories = vec![];
-        for x in &context_info.sources {
-            if let ContextSourceValueEnum::Repository(x) = x {
-                repositories.push(CodeRepository::new(&x.git_url, &x.source_id));
-            }
-        }
-
         Self {
             sources: context_info
                 .sources
                 .iter()
                 .map(|source| (source.source_id(), source.source_name()))
                 .collect(),
-            allowed_code_repository: AllowedCodeRepository::new(repositories),
+            allowed_code_repository: context_info.allowed_code_repository()
         }
     }
 
@@ -146,8 +151,8 @@ impl ContextInfoHelper {
         self.sources.contains_key(source_id)
     }
 
-    pub fn find_closet_git_url(&self, git_url: &str) -> Option<&str> {
-        self.allowed_code_repository.closest_match(git_url)
+    pub fn allowed_code_repository(&self) -> &AllowedCodeRepository {
+        &self.allowed_code_repository
     }
 }
 

diff --git a/ee/tabby-webserver/src/service/answer.rs b/ee/tabby-webserver/src/service/answer.rs
@@ -197,7 +197,7 @@ impl AnswerService {
                     None
                 }
             } else if let Some(git_url) = &input.git_url {
-                helper.find_closet_git_url(git_url)
+                helper.allowed_code_repository().closest_match(git_url)
             } else {
                 None
             }

diff --git a/ee/tabby-webserver/src/service/mod.rs b/ee/tabby-webserver/src/service/mod.rs
@@ -234,7 +234,7 @@ impl WorkerService for ServerContext {
 
             request
                 .extensions_mut()
-                .insert(context_info.helper().allowed_code_repository);
+                .insert(context_info.allowed_code_repository());
         }
 
         next.run(request).await