Formatting

This commit is contained in:
2025-06-03 21:57:22 -04:00
parent 263c33fd5a
commit 995e86f229
13 changed files with 68 additions and 69 deletions

View File

@@ -8,13 +8,13 @@ use chrono::{DateTime, Utc};
use flate2::read::GzDecoder;
use reqwest::header::ETAG;
use serde::{Deserialize, Serialize};
use sqlx::{Postgres, QueryBuilder};
use std::collections::HashSet;
use std::env;
use std::fmt::Display;
use std::io::{Cursor, Read};
use std::str::FromStr;
use std::sync::OnceLock;
use sqlx::{Postgres, QueryBuilder};
use utoipa::ToSchema;
static TIME_OFFSET: OnceLock<i64> = OnceLock::new();
@@ -310,9 +310,11 @@ impl MetarRow {
let chunk_size = 1000;
for chunk in metars.chunks(chunk_size) {
let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(
format!("INSERT INTO {} (icao, observation_time, raw_text, data) ", TABLE_NAME));
query_builder.push_values(chunk, |mut b, metar | {
let mut query_builder: QueryBuilder<Postgres> = QueryBuilder::new(format!(
"INSERT INTO {} (icao, observation_time, raw_text, data) ",
TABLE_NAME
));
query_builder.push_values(chunk, |mut b, metar| {
let row: Self = match metar.to_row() {
Ok(row) => row,
Err(e) => {
@@ -394,12 +396,16 @@ impl Metar {
metar.observation_time = match chrono::DateTime::parse_from_rfc3339(&observation_time) {
Ok(datetime) => datetime.with_timezone(&Utc),
Err(err) => return Err(err.into()),
};
},
};
}
Err(err) => {
return Err(Error::new(
err.status,
format!("Unexpected observation time field '{}': {}; {}", observation_time, metar_string, err)));
err.status,
format!(
"Unexpected observation time field '{}': {}; {}",
observation_time, metar_string, err
),
));
}
};
@@ -531,10 +537,10 @@ impl Metar {
visibility_parts[1]
} else {
log::warn!(
"Skipping unexpected visibility field '{:?}' ({})",
visibility_parts,
metar_string
);
"Skipping unexpected visibility field '{:?}' ({})",
visibility_parts,
metar_string
);
continue;
}
}
@@ -570,7 +576,11 @@ impl Metar {
metar.visibility_statute_mi = Some(format!("{:.2}", visibility));
}
} else {
log::warn!("Skipping unexpected visibility field '{}' ({})", metar_parts[0], metar_string);
log::warn!(
"Skipping unexpected visibility field '{}' ({})",
metar_parts[0],
metar_string
);
}
}