diff --git a/divi/src/card_record.rs b/divi/src/card_record.rs index f8e2ee05..4ab8d43d 100644 --- a/divi/src/card_record.rs +++ b/divi/src/card_record.rs @@ -6,8 +6,9 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)] pub struct CardRecord { + #[serde(alias = "Name")] pub name: String, - #[serde(alias = "stackSize")] + #[serde(alias = "Quantity")] pub amount: u32, #[serde(alias = "calculated")] pub price: Option, diff --git a/divi/src/sample.rs b/divi/src/sample.rs index 7d3cfdea..6c5a17c4 100644 --- a/divi/src/sample.rs +++ b/divi/src/sample.rs @@ -254,8 +254,10 @@ impl Display for MissingHeadersError { /// Parsing helper. Uses for CSV data fn remove_lines_before_headers(s: &str) -> Result { match s.lines().enumerate().find(|(_index, line)| { - line.contains("name") - && ["amount", "stackSize"] + ["Name", "name"] + .iter() + .any(|variant| line.contains(variant)) + && ["amount", "stackSize", "Quantity"] .iter() .any(|variant| line.contains(variant)) }) { @@ -320,8 +322,9 @@ fn preserve_column_order(columns: &[Column]) -> Vec { #[derive(Debug, Clone, Serialize, Deserialize)] pub struct NameAmount { + #[serde(alias = "Name")] pub name: String, - #[serde(alias = "stackSize")] + #[serde(alias = "stackSize", alias = "Quantity")] pub amount: u32, }