From 523a635dc88bc7890a0e1d3c062a8165259761d6 Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Thu, 24 Sep 2020 09:38:18 +0200
Subject: don't try to read into the json data structure all manually

---
 src/roomtemplate.rs | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'src/roomtemplate.rs')

diff --git a/src/roomtemplate.rs b/src/roomtemplate.rs
index 87c94fe..7110e64 100644
--- a/src/roomtemplate.rs
+++ b/src/roomtemplate.rs
@@ -1,6 +1,7 @@
 
 use std::collections::HashMap;
 use serde_json::{json, Value, value};
+use serde::{Deserialize, Deserializer, de, Serialize};
 use crate::{
 	Pos,
 	Template,
@@ -18,6 +19,52 @@ pub struct RoomTemplate {
 	pub permissions: RoomPermissions
 }
 
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct RoomTemplateSave {
+	pub width: i64,
+	pub height: i64,
+	pub spawn: Pos,
+	pub field: Vec<String>,
+	pub mapping: HashMap<char, TemplateList>,
+	#[serde(default)]
+	pub places: HashMap<String, Pos>,
+	#[serde(default)]
+	pub permissions: RoomPermissions
+}
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+enum TemplateList {
+	Single(Template),
+	List(Vec<Template>)
+}
+impl<'de> Deserialize<'de> for RoomTemplate {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where D: Deserializer<'de>,
+	{
+		let rts = RoomTemplateSave::deserialize(deserializer)?;
+		let mut field = Vec::new();
+		let width = rts.width as usize;
+		let height = rts.height as usize;
+		field.resize_with(width * height, Vec::new);
+		for (y, row) in rts.field.iter().take(height).enumerate() {
+			for (x, ch) in row.chars().take(width).enumerate() {
+				let templates = rts.mapping.get(&ch).ok_or(de::Error::custom(format!("char {}not found in mapping", ch)))?.clone();
+				field[x + y * width] = match templates {
+					TemplateList::Single(temp) => vec![temp],
+					TemplateList::List(temps) => temps
+				}
+			}
+		}
+		Ok(Self {
+			size: (rts.width, rts.height),
+			spawn: rts.spawn,
+			field,
+			places: rts.places,
+			permissions: rts.permissions
+		})
+	}
+}
+
 impl RoomTemplate {
 
 	pub fn from_json(jsonroom: &Value) -> PResult<RoomTemplate>{
@@ -80,7 +127,7 @@ mod tests {
 	
 	#[test]
 	fn simple_from_json() {
-		RoomTemplate::from_json(&json!({
+		RoomTemplate::deserialize(&json!({
 			"width": 6,
 			"height": 5,
 			"spawn": [1, 1],
-- 
cgit