removed ClassList

Author: Tails8521

Cargo.lock

@@ -8,7 +8,6 @@ edition = "2018"
 tf-demo-parser = { git = "https://github.com/Tails8521/parser", rev = "52000d77c5c3729d9a3e3dc307b413372a3de837" }
 serde = { version = "=1.0.114", features = ["derive"] }
 serde_json = "=1.0.56"
-serde_repr = "=0.1.6"
 num_enum = "=0.5.0"
 image = "=0.23.8"
 palette = "=0.5"

Cargo.toml

@@ -10,7 +10,7 @@ use std::{
     path::PathBuf,
 };
 
-use coldmaps::heatmap_analyser::{Class, ClassList, HeatmapAnalyser, HeatmapAnalysis, PlayerEntity, PlayerState, Spawn, Team, UserId, UserInfo};
+use coldmaps::heatmap_analyser::{Class, HeatmapAnalyser, HeatmapAnalysis, PlayerEntity, PlayerState, Spawn, Team, UserId, UserInfo};
 use serde::Serialize;
 use tf_demo_parser::{
     demo::gamevent::GameEvent, demo::header::Header, demo::message::packetentities::EntityId, demo::message::packetentities::PacketEntity, demo::message::Message,
@@ -546,7 +546,6 @@ impl DemoAnalyzer {
             GameEvent::PlayerSpawn(event) => {
                 let spawn = Spawn::from_event(event, tick);
                 if let Some(user_state) = self.state.users.get_mut(&spawn.user) {
-                    user_state.classes[spawn.class] += 1;
                     user_state.team = spawn.team;
                 }
             }
@@ -576,7 +575,6 @@ impl DemoAnalyzer {
                         }
                     })
                     .or_insert_with(|| UserInfo {
-                        classes: ClassList::default(),
                         team: Team::Other,
                         steam_id,
                         user_id,

src/demo_player.rs

@@ -1,9 +1,7 @@
 use num_enum::TryFromPrimitive;
-use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
-use serde_repr::{Deserialize_repr, Serialize_repr};
+use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};
 use std::convert::TryFrom;
-use std::ops::{Index, IndexMut};
 use std::str::FromStr;
 use tf_demo_parser::demo::gameevent_gen::{GameEvent, PlayerDeathEvent, PlayerSpawnEvent, TeamPlayRoundWinEvent};
 use tf_demo_parser::demo::message::packetentities::{EntityId, PacketEntity};
@@ -66,7 +64,7 @@ impl Default for Team {
     }
 }
 
-#[derive(Debug, Clone, Serialize_repr, Deserialize_repr, Copy, PartialEq, Eq, Hash, TryFromPrimitive)]
+#[derive(Debug, Clone, Serialize, Deserialize, Copy, PartialEq, Eq, Hash, TryFromPrimitive)]
 #[repr(u8)]
 pub enum Class {
     Other = 0,
@@ -96,55 +94,6 @@ impl Default for Class {
     }
 }
 
-#[derive(Default, Debug, Eq, PartialEq, Deserialize, Clone)]
-#[serde(from = "HashMap<Class, u8>")]
-pub struct ClassList([u8; 10]);
-
-impl Index<Class> for ClassList {
-    type Output = u8;
-
-    #[cfg_attr(feature = "no-panic", no_panic::no_panic)]
-    fn index(&self, class: Class) -> &Self::Output {
-        &self.0[class as u8 as usize]
-    }
-}
-
-impl IndexMut<Class> for ClassList {
-    #[cfg_attr(feature = "no-panic", no_panic::no_panic)]
-    fn index_mut(&mut self, class: Class) -> &mut Self::Output {
-        &mut self.0[class as u8 as usize]
-    }
-}
-
-impl Serialize for ClassList {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let count = self.0.iter().filter(|c| **c > 0).count();
-        let mut classes = serializer.serialize_map(Some(count))?;
-        for (class, count) in self.0.iter().copied().enumerate() {
-            if count > 0 {
-                classes.serialize_entry(&class, &count)?;
-            }
-        }
-
-        classes.end()
-    }
-}
-
-impl From<HashMap<Class, u8>> for ClassList {
-    fn from(map: HashMap<Class, u8>) -> Self {
-        let mut classes = ClassList::default();
-
-        for (class, count) in map.into_iter() {
-            classes[class] = count;
-        }
-
-        classes
-    }
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, Copy, PartialEq, Eq, Hash, Ord, PartialOrd)]
 pub struct UserId(u32);
 
@@ -182,7 +131,6 @@ impl Spawn {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct UserInfo {
-    pub classes: ClassList,
     pub name: String,
     pub user_id: UserId,
     pub steam_id: String,
@@ -192,7 +140,7 @@ pub struct UserInfo {
 
 impl PartialEq for UserInfo {
     fn eq(&self, other: &UserInfo) -> bool {
-        self.classes == other.classes && self.name == other.name && self.user_id == other.user_id && self.steam_id == other.steam_id && self.team == other.team
+        self.name == other.name && self.user_id == other.user_id && self.steam_id == other.steam_id && self.team == other.team
     }
 }
 
@@ -480,7 +428,6 @@ impl HeatmapAnalyser {
             GameEvent::PlayerSpawn(event) => {
                 let spawn = Spawn::from_event(event, tick);
                 if let Some(user_state) = self.state.users.get_mut(&spawn.user) {
-                    user_state.classes[spawn.class] += 1;
                     user_state.team = spawn.team;
                 }
             }
@@ -515,7 +462,6 @@ impl HeatmapAnalyser {
                         }
                     })
                     .or_insert_with(|| UserInfo {
-                        classes: ClassList::default(),
                         team: Team::Other,
                         steam_id,
                         user_id,
@@ -551,7 +497,6 @@ impl Default for HeatmapAnalysis {
             users: {
                 let mut users = BTreeMap::new();
                 let world = UserInfo {
-                    classes: ClassList::default(),
                     entity_id: Some(EntityId::from(0)),
                     name: "world".into(),
                     user_id: UserId::from(0u32),