From 3d8867d218ea6b78aa3f027b8573f5c2575b0b1a Mon Sep 17 00:00:00 2001
From: clerie <git@clerie.de>
Date: Sun, 9 Feb 2025 21:24:57 +0100
Subject: [PATCH] Connect to db via storage module

---
 src/bin/scan-flake.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/bin/scan-flake.rs b/src/bin/scan-flake.rs
index 4ed7621..1a7f2dc 100644
--- a/src/bin/scan-flake.rs
+++ b/src/bin/scan-flake.rs
@@ -14,9 +14,9 @@ use flake_tracker::{
         FlakeMetadata,
         FlakeUri,
     },
-};
-use sqlx::{
-    sqlite::SqlitePoolOptions,
+    storage::{
+        Storage,
+    },
 };
 use std::process::Command;
 
@@ -32,7 +32,10 @@ async fn main() -> Result<()> {
 
     let scan_time = Utc::now().timestamp();
 
-    let db = SqlitePoolOptions::new().connect("sqlite://flake-tracker.db").await?;
+    let storage = Storage::connect("sqlite://flake-tracker.db")
+        .await
+        .context("Failed to connect to database")?;
+
 
     let flake_metadata_raw = Command::new("nix")
         .arg("flake")
@@ -60,7 +63,7 @@ async fn main() -> Result<()> {
         .bind(&flake_metadata.locked.narHash)
         .bind(&flake_metadata.locked.lastModified)
         .bind(&scan_time)
-        .execute(&db).await?;
+        .execute(&storage.db).await?;
 
     let locks_root_name = &flake_metadata.locks.root;
     let locks_root_node = flake_metadata.locks.nodes.get(locks_root_name)
@@ -86,7 +89,7 @@ async fn main() -> Result<()> {
                 .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(&db).await?;
+                .execute(&storage.db).await?;
 
             sqlx::query("INSERT INTO revisions (revision_uri, flake_uri)
                 VALUES (?, ?)
@@ -94,7 +97,7 @@ async fn main() -> Result<()> {
                 ")
                 .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(&db).await?;
+                .execute(&storage.db).await?;
         }
     }