Make update_latest_version

TabbyML · Apr 5, 2024 · 323a3c7 · 323a3c7
1 parent 443b281
commit 323a3c7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/ee/tabby-webserver/src/hub/api.rs b/ee/tabby-webserver/src/hub/api.rs
@@ -221,17 +221,7 @@ impl RepositoryAccess for SchedulerClient {
                 return;
             }
         };
-        let old_version = match cache.latest_version() {
-            Ok(v) => v,
-            Err(e) => {
-                error!("Failed to get next repository cache version: {e}");
-                return;
-            }
-        };
-        if let Err(e) = cache
-            .set_version(version)
-            .and_then(|_| cache.clear_versions_under(old_version))
-        {
+        if let Err(e) = cache.update_latest_version(version) {
             error!("Failed to update repository cache version: {e}");
         }
     }

diff --git a/ee/tabby-webserver/src/path.rs b/ee/tabby-webserver/src/path.rs
@@ -1,5 +1,5 @@
 use std::path::PathBuf;
 
 pub fn repository_meta_db() -> PathBuf {
-    tabby_common::path::tabby_root().join("repositories.kv")
+    tabby_common::path::tabby_root().join("ee/repositories.kv")
 }
diff --git a/ee/tabby-webserver/src/repositories/resolve.rs b/ee/tabby-webserver/src/repositories/resolve.rs
@@ -41,17 +41,18 @@ impl RepositoryCache {
     pub fn latest_version(&self) -> Result<u64> {
         let bucket: Bucket<_, String> = self.cache.bucket(Some(META_BUCKET))?;
         if !bucket.contains(&META_BUCKET_VERSION_KEY.to_string())? {
-            self.set_version(self.get_next_version()?)?;
+            self.update_latest_version(self.get_next_version()?)?;
         }
         Ok(bucket
             .get(&META_BUCKET_VERSION_KEY.to_string())?
             .expect("Cache version must always be set")
             .parse()?)
     }
 
-    pub fn set_version(&self, version: u64) -> Result<()> {
+    pub fn update_latest_version(&self, version: u64) -> Result<()> {
         let bucket = self.cache.bucket(Some(META_BUCKET))?;
         bucket.set(&META_BUCKET_VERSION_KEY.to_string(), &version.to_string())?;
+        self.clear_versions_under(version)?;
         Ok(())
     }
 
@@ -76,7 +77,7 @@ impl RepositoryCache {
             let Ok(version) = version.parse::<u64>() else {
                 continue;
             };
-            if version <= old_version {
+            if version < old_version {
                 self.cache.drop_bucket(bucket)?;
             }
         }