List manifest return manifest data struct

Cargo.toml

@@ -179,6 +179,8 @@ sha2 = { version = "0.10.8", default-features = false }
 sharks = "0.5.0"
 sodiumoxide = { version = "0.2.7", default-features = false }
 sqlx = { version = "0.7.2", default-features = false }
+sqlx-core = { version = "0.7.2", default-features = false }
+sqlx-sqlite = { version = "0.7.2", default-features = false }
 syn = { version = "2.0.72", default-features = false }
 spinners = { version = "4.1.1", default-features = false }
 thiserror = { version = "1.0.63", default-features = false }

libparsec/crates/platform_storage/Cargo.toml

@@ -31,6 +31,8 @@ tokio = { workspace = true, features = ["fs", "sync"] }
 # We add this dependency to have sqlite3 bundled into our code.
 libsqlite3-sys = { workspace = true, features = ["bundled"] }
 sqlx = { workspace = true, features = ["sqlite", "runtime-tokio", "macros"] }
+sqlx-core = { workspace = true, features = ["uuid"] }
+sqlx-sqlite = { workspace = true, features = ["uuid"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 indexed_db_futures = { workspace = true, features = ["indices", "cursors"] }

libparsec/crates/platform_storage/src/native/workspace.rs

@@ -204,7 +204,7 @@ impl PlatformWorkspaceStorage {
         &mut self,
         page: u32,
         limit: u32,
-    ) -> anyhow::Result<Vec<RawEncryptedManifest>> {
+    ) -> anyhow::Result<Vec<ManifestData>> {
         db_list_manifests(&mut self.conn, page, limit).await
     }
 
@@ -654,18 +654,31 @@ async fn db_list_manifests(
     executor: impl sqlx::Executor<'_, Database = sqlx::Sqlite>,
     page: u32,
     limit: u32,
-) -> anyhow::Result<Vec<RawEncryptedManifest>> {
+) -> anyhow::Result<Vec<ManifestData>> {
     let offset = page * limit;
-    let rows = sqlx::query("SELECT blob FROM vlobs LIMIT ?1 OFFSET ?2")
-        .bind(limit)
-        .bind(offset)
-        .fetch_many(executor);
+    let rows =
+        sqlx::query("SELECT vlob_id, blob, need_sync, base_version FROM vlobs LIMIT ?1 OFFSET ?2")
+            .bind(limit)
+            .bind(offset)
+            .fetch_many(executor);
+
+    fn row_to_manifest_data(row: sqlx::sqlite::SqliteRow) -> anyhow::Result<ManifestData> {
+        Ok(ManifestData {
+            entry_id: row
+                .try_get::<sqlx::types::Uuid, usize>(0)
+                .map(VlobID::from)
+                .map_err(anyhow::Error::from)?,
+            encrypted: row.try_get(1).map_err(anyhow::Error::from)?,
+            need_sync: row.try_get(2).map_err(anyhow::Error::from)?,
+            base_version: row.try_get(3).map_err(anyhow::Error::from)?,
+        })
+    }
 
-    let res: anyhow::Result<Vec<RawEncryptedManifest>> = rows
+    let res: anyhow::Result<Vec<ManifestData>> = rows
         .filter_map(|row_res| async {
             match row_res {
                 Ok(sqlx::Either::Left(_res)) => None,
-                Ok(sqlx::Either::Right(row)) => Some(row.try_get(0).map_err(anyhow::Error::from)),
+                Ok(sqlx::Either::Right(row)) => Some(row_to_manifest_data(row)),
                 Err(e) => Some(Err(e.into())),
             }
         })

libparsec/crates/platform_storage/src/workspace.rs

@@ -146,7 +146,7 @@ impl WorkspaceStorage {
         &mut self,
         page: u32,
         limit: u32,
-    ) -> anyhow::Result<Vec<RawEncryptedManifest>> {
+    ) -> anyhow::Result<Vec<ManifestData>> {
         self.platform.list_manifests(page, limit).await
     }