fix(metadata): fix metadata sync interval handling

Author: QaidVoid

soar-cli/src/state.rs

@@ -47,11 +47,6 @@ impl AppState {
         let mut tasks = Vec::new();
 
         for repo in &self.inner.config.repositories {
-            let db_file = repo.get_path()?.join("metadata.db");
-            if !db_file.exists() {
-                fs::create_dir_all(repo.get_path()?)?;
-                File::create(&db_file)?;
-            }
             let repo_clone = repo.clone();
             let task = tokio::task::spawn(async move { fetch_metadata(repo_clone, force).await });
             tasks.push(task);

soar-core/src/database/models.rs

@@ -278,18 +278,26 @@ pub struct RemotePackage {
     #[serde(default, deserialize_with = "optional_number")]
     pub rank: Option<u64>,
 
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub pkg: Option<String>,
     pub pkg_id: String,
     pub pkg_name: String,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub pkg_family: Option<String>,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub pkg_type: Option<String>,
 
     #[serde(default, deserialize_with = "empty_is_none")]
     pub pkg_webpage: Option<String>,
 
     pub description: String,
     pub version: String,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub version_upstream: Option<String>,
+
     pub download_url: String,
 
     #[serde(default, deserialize_with = "optional_number")]
@@ -302,7 +310,11 @@ pub struct RemotePackage {
     pub ghcr_size_raw: Option<u64>,
 
     pub ghcr_files: Option<Vec<String>>,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub ghcr_blob: Option<String>,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub ghcr_url: Option<String>,
 
     #[serde(alias = "src_url")]
@@ -323,7 +335,10 @@ pub struct RemotePackage {
     #[serde(alias = "tag")]
     pub tags: Option<Vec<String>>,
 
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub bsum: Option<String>,
+
+    #[serde(default, deserialize_with = "empty_is_none")]
     pub shasum: Option<String>,
 
     #[serde(default, deserialize_with = "empty_is_none")]

soar-core/src/metadata.rs

@@ -69,19 +69,27 @@ pub async fn fetch_public_key<P: AsRef<Path>>(
 
 pub async fn fetch_metadata(repo: Repository, force: bool) -> SoarResult<()> {
     let repo_path = repo.get_path()?;
-    if !repo_path.is_dir() {
-        return Err(SoarError::InvalidPath);
+    let metadata_db = repo_path.join("metadata.db");
+
+    if !metadata_db.exists() {
+        fs::create_dir_all(repo.get_path()?)?;
+        File::create(&metadata_db)?;
     }
 
-    let metadata_db = repo_path.join("metadata.db");
-    if !force {
+    let conn = Connection::open(&metadata_db)?;
+    let etag: String = conn
+        .query_row("SELECT etag FROM repository", [], |row| row.get(0))
+        .unwrap_or_default();
+
+    if !force && !etag.is_empty() {
         let file_info = metadata_db.metadata()?;
         if let Ok(created) = file_info.created() {
             if repo.sync_interval() >= created.elapsed()?.as_millis() as u128 {
                 return Ok(());
             }
         }
     }
+    drop(conn);
 
     let client = reqwest::Client::new();
 
@@ -100,11 +108,6 @@ pub async fn fetch_metadata(repo: Repository, force: bool) -> SoarResult<()> {
     }
 
     let etag = {
-        let conn = Connection::open(&metadata_db)?;
-        let etag: String = conn
-            .query_row("SELECT etag FROM repository", [], |row| row.get(0))
-            .unwrap_or_default();
-
         match resp.headers().get(header::ETAG) {
             Some(remote_etag) => {
                 let remote_etag = remote_etag.to_str().unwrap();