From d2957d1799d0c83485b0bb4c27d09c80ba64d214 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 10 Feb 2025 17:34:30 +0100 Subject: [PATCH] Make all struct members snake case --- src/flake.rs | 9 ++++++--- src/scan.rs | 8 ++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/flake.rs b/src/flake.rs index d69edc6..41762c6 100644 --- a/src/flake.rs +++ b/src/flake.rs @@ -10,7 +10,8 @@ use std::collections::HashMap; #[derive(Deserialize, Debug)] pub struct FlakeMetadata { - pub lastModified: i64, + #[serde(rename = "lastModified")] + pub last_modified: i64, pub locked: FlakeLockedInfo, pub locks: FlakeLocks, pub original: FlakeSource, @@ -100,8 +101,10 @@ impl FlakeUri for FlakeSource { #[derive(Deserialize, Debug, Clone)] pub struct FlakeLockedInfo { - pub lastModified: i64, - pub narHash: String, + #[serde(rename = "lastModified")] + pub last_modified: i64, + #[serde(rename = "narHash")] + pub nar_hash: String, pub owner: Option, pub repo: Option, pub r#ref: Option, diff --git a/src/scan.rs b/src/scan.rs index 2ec300e..e4b9b41 100644 --- a/src/scan.rs +++ b/src/scan.rs @@ -37,8 +37,8 @@ pub async fn scan_flake(storage: Storage, flake_uri: &str) -> Result<()> { 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()), + nar_hash: Some(flake_metadata.locked.nar_hash.clone()), + last_modified: Some(flake_metadata.locked.last_modified.clone()), tracker_last_scanned: Some(scan_time.clone()), }; @@ -60,8 +60,8 @@ pub async fn scan_flake(storage: Storage, flake_uri: &str) -> Result<()> { 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), + locked_nar_hash: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.nar_hash), + last_modified: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.last_modified), }; storage.set_input(input_row) .await?;