Merge pull request #10 from krakow10/entity

Entity Changes

examples/parse.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), vbsp::BspError> {
     let data = std::fs::read(args.next().expect("No demo file provided"))?;
     let bsp = vbsp::Bsp::read(&data)?;
     for prop in bsp.entities.iter() {
-        match prop.parse() {
+        match prop.parse::<vbsp::Entity>() {
             Ok(prop) => {
                 println!("{:#?}", prop)
             }

src/data/entity.rs

@@ -111,23 +111,20 @@ impl<'a> RawEntity<'a> {
         Iter { buf: self.buf }
     }
 
-    pub fn prop(&self, key: &'static str) -> Result<&'a str, EntityParseError> {
+    pub fn prop(&self, key: &'static str) -> Option<&'a str> {
         self.properties()
             .find_map(|(prop_key, value)| (key == prop_key).then_some(value))
-            .ok_or(EntityParseError::NoSuchProperty(key))
     }
 
-    pub fn prop_parse<T: EntityProp<'a>>(&self, key: &'static str) -> Result<T, EntityParseError> {
+    pub fn prop_parse<T: EntityProp<'a>>(
-        T::parse(self.prop(key)?)
+        &self,
+        key: &'static str,
+    ) -> Option<Result<T, EntityParseError>> {
+        Some(T::parse(self.prop(key)?))
     }
 
-    pub fn parse(&self) -> Result<Entity<'a>, EntityParseError> {
+    pub fn parse<E: Deserialize<'a>>(&self) -> Result<E, VdfError> {
-        match vdf_reader::from_str(self.buf) {
+        vdf_reader::from_str(self.buf)
-            Ok(entity) => Ok(entity),
-            Err(VdfError::UnknownVariant(_)) => Ok(Entity::Unknown(self.clone())),
-            // todo
-            Err(_) => Err(EntityParseError::NoSuchProperty("unknown serde error")),
-        }
     }
 }
 
@@ -281,7 +278,7 @@ impl<'de> Deserialize<'de> for LightColor {
 pub use typed::*;
 
 mod typed {
-    use crate::{Angles, Color, LightColor, RawEntity, Vector};
+    use crate::{Angles, Color, LightColor, Vector};
     use serde::{Deserialize, Deserializer};
 
     #[derive(Debug, Clone, Deserialize)]
@@ -399,8 +396,6 @@ mod typed {
         #[serde(rename = "func_occluder")]
         #[serde(borrow)]
         Occluder(Occluder<'a>),
-        #[serde(skip)]
-        Unknown(RawEntity<'a>),
     }
 
     #[derive(Debug, Clone, Deserialize)]

src/error.rs

@@ -124,8 +124,6 @@ pub enum InvalidNeighbourError {
 
 #[derive(Debug, Error)]
 pub enum EntityParseError {
-    #[error("no such property: {0}")]
-    NoSuchProperty(&'static str),
     #[error("wrong number of elements")]
     ElementCount,
     #[error(transparent)]