Move all sql queries to storage module

src/bin/scan-flake.rs

@@ -15,6 +15,8 @@ use flake_tracker::{
         FlakeUri,
     },
     storage::{
+        InputRow,
+        RevisionRow,
         Storage,
     },
 };
@@ -48,22 +50,17 @@ async fn main() -> Result<()> {
     let flake_metadata: FlakeMetadata = serde_json::from_slice(&flake_metadata_raw.stdout)
         .context("Failed to parse flake metadata")?;
 
-    sqlx::query("INSERT INTO revisions (revision_uri, flake_uri, nix_store_path, nar_hash, last_modified, tracker_last_scanned)
-        VALUES (?, ?, ?, ?, ?, ?)
-        ON CONFLICT(revision_uri) DO UPDATE SET
-            flake_uri=excluded.flake_uri,
-            nix_store_path=excluded.nix_store_path,
-            nar_hash=excluded.nar_hash,
-            last_modified=excluded.last_modified,
-            tracker_last_scanned=excluded.tracker_last_scanned
-        ")
-        .bind(&flake_metadata.locked.flake_uri()?)
-        .bind(&flake_metadata.resolved.flake_uri()?)
-        .bind(&flake_metadata.path)
-        .bind(&flake_metadata.locked.narHash)
-        .bind(&flake_metadata.locked.lastModified)
-        .bind(&scan_time)
-        .execute(&storage.db).await?;
+    let revision_row = RevisionRow {
+        revision_uri: flake_metadata.locked.flake_uri()?.clone(),
+        flake_uri: Some(flake_metadata.resolved.flake_uri()?.clone()),
+        nix_store_path: Some(flake_metadata.path.clone()),
+        nar_hash: Some(flake_metadata.locked.narHash.clone()),
+        last_modified: Some(flake_metadata.locked.lastModified.clone()),
+        tracker_last_scanned: Some(scan_time.clone()),
+    };
+
+    storage.set_revision(revision_row)
+        .await?;
 
     let locks_root_name = &flake_metadata.locks.root;
     let locks_root_node = flake_metadata.locks.nodes.get(locks_root_name)
@@ -75,29 +72,27 @@ async fn main() -> Result<()> {
             let locks_input_node = flake_metadata.locks.nodes.get(&locks_input_name)
                 .context("Failed to find lock of input")?;
 
-            sqlx::query("INSERT INTO inputs (revision_uri, input_name, locked_revision_uri, locked_flake_uri, locked_nar_hash, last_modified)
-                VALUES (?, ?, ?, ?, ?, ?)
-                ON CONFLICT(revision_uri, input_name) DO UPDATE SET
-                    locked_revision_uri=excluded.locked_revision_uri,
-                    locked_flake_uri=excluded.locked_flake_uri,
-                    locked_nar_hash=excluded.locked_nar_hash,
-                    last_modified=excluded.last_modified
-                ")
-                .bind(flake_metadata.locked.flake_uri()?)
-                .bind(input_name)
-                .bind(locks_input_node.locked.clone().context("Unexpected missing lock")?.flake_uri()?)
-                .bind(locks_input_node.original.clone().context("Unexpected missing lock")?.flake_uri()?)
-                .bind(locks_input_node.locked.clone().context("Unexpected missing lock")?.narHash)
-                .bind(locks_input_node.locked.clone().context("Unexpected missing lock")?.lastModified)
-                .execute(&storage.db).await?;
+            let input_row = InputRow {
+                revision_uri: flake_metadata.locked.flake_uri()?.clone(),
+                input_name: input_name.clone(),
+                locked_revision_uri: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.flake_uri()?),
+                locked_flake_uri: Some(locks_input_node.original.clone().context("Unexpected missing lock")?.flake_uri()?),
+                locked_nar_hash: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.narHash),
+                last_modified: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.lastModified),
+            };
+            storage.set_input(input_row)
+                .await?;
 
-            sqlx::query("INSERT INTO revisions (revision_uri, flake_uri)
-                VALUES (?, ?)
-                ON CONFLICT(revision_uri) DO NOTHING
-                ")
-                .bind(locks_input_node.locked.clone().context("Unexpected missing lock")?.flake_uri()?)
-                .bind(locks_input_node.original.clone().context("Unexpected missing lock")?.flake_uri()?)
-                .execute(&storage.db).await?;
+            let revision_row = RevisionRow {
+                revision_uri: locks_input_node.locked.clone().context("Unexpected missing lock")?.flake_uri()?.clone(),
+                flake_uri: Some(locks_input_node.original.clone().context("Unexpected missing lock")?.flake_uri()?.clone()),
+                nix_store_path: None,
+                nar_hash: None,
+                last_modified: None,
+                tracker_last_scanned: None,
+            };
+            storage.set_revision_exist(revision_row)
+                .await?;
         }
     }
 

src/bin/web.rs

@@ -24,8 +24,8 @@ use flake_tracker::{
         Storage,
     },
     templates::{
+        FlakeListTemplate,
         FlakeTemplate,
-        FlakesTemplate,
         IndexTemplate,
         RevisionTemplate,
     },
@@ -113,7 +113,7 @@ async fn route_index() -> Result<impl IntoResponse, AppError> {
 async fn route_flakes(
     State(state): State<AppState>,
 ) -> Result<impl IntoResponse, AppError> {
-    Ok(render_template(&FlakesTemplate {
+    Ok(render_template(&FlakeListTemplate {
         flakes: state.storage.flakes().await?,
     })?)
 }

src/storage.rs

@@ -2,13 +2,20 @@ use anyhow::{
     Context,
     Result,
 };
+use chrono::{
+    DateTime,
+    Utc,
+};
 use crate::utils::{
     urlencode,
 };
 use sqlx::{
     FromRow,
     SqlitePool,
-    sqlite::SqlitePoolOptions,
+    sqlite::{
+        SqlitePoolOptions,
+        SqliteQueryResult,
+    },
 };
 
 #[derive(Clone)]
@@ -40,6 +47,39 @@ impl Storage {
             .context("Failed to fetch data from database")
     }
 
+    pub async fn set_revision(&self, revision_row: RevisionRow) -> Result<SqliteQueryResult> {
+        sqlx::query("INSERT INTO revisions (revision_uri, flake_uri, nix_store_path, nar_hash, last_modified, tracker_last_scanned)
+            VALUES (?, ?, ?, ?, ?, ?)
+            ON CONFLICT(revision_uri) DO UPDATE SET
+                flake_uri=excluded.flake_uri,
+                nix_store_path=excluded.nix_store_path,
+                nar_hash=excluded.nar_hash,
+                last_modified=excluded.last_modified,
+                tracker_last_scanned=excluded.tracker_last_scanned
+            ")
+            .bind(&revision_row.revision_uri)
+            .bind(&revision_row.flake_uri)
+            .bind(&revision_row.nix_store_path)
+            .bind(&revision_row.nar_hash)
+            .bind(&revision_row.last_modified)
+            .bind(&revision_row.tracker_last_scanned)
+            .execute(&self.db)
+            .await
+            .context("Failed to execute database query")
+    }
+
+    pub async fn set_revision_exist(&self, revision_row: RevisionRow) -> Result<SqliteQueryResult> {
+        sqlx::query("INSERT INTO revisions (revision_uri, flake_uri)
+            VALUES (?, ?)
+            ON CONFLICT(revision_uri) DO NOTHING
+            ")
+            .bind(&revision_row.revision_uri)
+            .bind(&revision_row.flake_uri)
+            .execute(&self.db)
+            .await
+            .context("Failed to execute database query")
+    }
+
     pub async fn revisions_from_flake(&self, uri: &str) -> Result<Vec<RevisionRow>> {
         sqlx::query_as("
             SELECT
@@ -59,6 +99,27 @@ impl Storage {
             .context("Failed to fetch data from database")
     }
 
+    pub async fn set_input(&self, input_row: InputRow) -> Result<SqliteQueryResult> {
+        sqlx::query("INSERT INTO inputs (revision_uri, input_name, locked_revision_uri, locked_flake_uri, locked_nar_hash, last_modified)
+            VALUES (?, ?, ?, ?, ?, ?)
+            ON CONFLICT(revision_uri, input_name) DO UPDATE SET
+                locked_revision_uri=excluded.locked_revision_uri,
+                locked_flake_uri=excluded.locked_flake_uri,
+                locked_nar_hash=excluded.locked_nar_hash,
+                last_modified=excluded.last_modified
+            ")
+            .bind(input_row.revision_uri)
+            .bind(input_row.input_name)
+            .bind(input_row.locked_revision_uri)
+            .bind(input_row.locked_flake_uri)
+            .bind(input_row.locked_nar_hash)
+            .bind(input_row.last_modified)
+            .execute(&self.db)
+            .await
+            .context("Failed to execute database query")
+
+    }
+
     pub async fn inputs_for_revision(&self, revision_uri: &str) -> Result<Vec<InputRow>> {
         sqlx::query_as("
             SELECT
@@ -147,6 +208,13 @@ impl RevisionRow {
             None => String::from("#"),
         }
     }
+
+    pub fn last_modified_time(&self) -> Option<DateTime<Utc>> {
+        match &self.last_modified {
+            Some(last_modified) => DateTime::from_timestamp(last_modified.clone(), 0),
+            None => None,
+        }
+    }
 }
 
 #[derive(FromRow)]

src/templates.rs

@@ -15,8 +15,8 @@ pub struct IndexTemplate {
 }
 
 #[derive(Template)]
-#[template(path = "flakes.html")]
-pub struct FlakesTemplate {
+#[template(path = "flake_list.html")]
+pub struct FlakeListTemplate {
     pub flakes: Vec<FlakeRow>,
 }
 

templates/flake.html

@@ -11,7 +11,7 @@
 
 <ul>
 {% for revision in revisions %}
-<li><a href="{{ revision.revision_link() }}">{{ revision.revision_uri }}</a> {% match revision.last_modified %}{% when Some with (last_modified) %}({{ last_modified }}){% when None %}{% endmatch %}</li>
+<li><a href="{{ revision.revision_link() }}">{{ revision.revision_uri }}</a> {% match revision.last_modified_time() %}{% when Some with (last_modified_time) %}({{ last_modified_time }}){% when None %}{% endmatch %}</li>
 {% endfor %}
 </ul>