Make all struct members snake case

This commit is contained in:
clerie 2025-02-10 17:34:30 +01:00
parent f6733f86a7
commit d2957d1799
2 changed files with 10 additions and 7 deletions

View File

@ -10,7 +10,8 @@ use std::collections::HashMap;
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct FlakeMetadata { pub struct FlakeMetadata {
pub lastModified: i64, #[serde(rename = "lastModified")]
pub last_modified: i64,
pub locked: FlakeLockedInfo, pub locked: FlakeLockedInfo,
pub locks: FlakeLocks, pub locks: FlakeLocks,
pub original: FlakeSource, pub original: FlakeSource,
@ -100,8 +101,10 @@ impl FlakeUri for FlakeSource {
#[derive(Deserialize, Debug, Clone)] #[derive(Deserialize, Debug, Clone)]
pub struct FlakeLockedInfo { pub struct FlakeLockedInfo {
pub lastModified: i64, #[serde(rename = "lastModified")]
pub narHash: String, pub last_modified: i64,
#[serde(rename = "narHash")]
pub nar_hash: String,
pub owner: Option<String>, pub owner: Option<String>,
pub repo: Option<String>, pub repo: Option<String>,
pub r#ref: Option<String>, pub r#ref: Option<String>,

View File

@ -37,8 +37,8 @@ pub async fn scan_flake(storage: Storage, flake_uri: &str) -> Result<()> {
revision_uri: flake_metadata.locked.flake_uri()?.clone(), revision_uri: flake_metadata.locked.flake_uri()?.clone(),
flake_uri: Some(flake_metadata.resolved.flake_uri()?.clone()), flake_uri: Some(flake_metadata.resolved.flake_uri()?.clone()),
nix_store_path: Some(flake_metadata.path.clone()), nix_store_path: Some(flake_metadata.path.clone()),
nar_hash: Some(flake_metadata.locked.narHash.clone()), nar_hash: Some(flake_metadata.locked.nar_hash.clone()),
last_modified: Some(flake_metadata.locked.lastModified.clone()), last_modified: Some(flake_metadata.locked.last_modified.clone()),
tracker_last_scanned: Some(scan_time.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(), input_name: input_name.clone(),
locked_revision_uri: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.flake_uri()?), 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_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), 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")?.lastModified), last_modified: Some(locks_input_node.locked.clone().context("Unexpected missing lock")?.last_modified),
}; };
storage.set_input(input_row) storage.set_input(input_row)
.await?; .await?;