refactor de Matche en Map

Author: Zat-Code

src/log_analyser/log_analyser.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime, timedelta
-from log_analyser.objects.match import Match
+from log_analyser.objects.map import Map
 
 
 class LogAnalyser:
@@ -12,9 +12,9 @@ def __init__(self, path_csv, name) -> None:
 
         self.date = self.name2datetime()
 
-        self.match = None
+        self.map = None
 
-        self.actions = {"match_start": self.process_match_start}
+        self.actions = {"match_start": self.process_map_start}
 
     def run(self):
 
@@ -30,7 +30,7 @@ def run(self):
                         self.actions[type](line_split)
 
         # with open("../logs_process/{}.json".format(self.name.split(".")[0]), "w") as file:
-        #     file.write(self.match.export_json())
+        #     file.write(self.map.export_json())
 
 
     def name2datetime(self):
@@ -40,9 +40,9 @@ def name2datetime(self):
 
         return date_object
 
-    def process_match_start(self, data):
+    def process_map_start(self, data):
 
-        self.match = Match.from_json({"rounds": [], 
+        self.map = Map.from_json({"rounds": [],
                        "date": self.date,
                        "map_name": data[3],
                        "map_type": data[4],
@@ -52,30 +52,30 @@ def process_match_start(self, data):
                        "score_team2": 0,
                        })
 
-        self.actions = {"match_start": self.process_match_start,
-                        "round_start": self.match.add_round,
-                        "round_end": self.match.end_round,
+        self.actions = {"match_start": self.process_map_start,
+                        "round_start": self.map.add_round,
+                        "round_end": self.map.end_round,
                         "hero_spawn": self.process_hero_spawn,
                         "hero_swap": self.process_hero_swap,
-                        "kill": self.match.add_kill,
-                        "ultimate_charged": self.match.add_ultimate_charged,
-                        "ultimate_start": self.match.add_ultimate_start,
-                        "ultimate_end": self.match.add_ultimate_end,
-                        "objective_captured": self.match.add_objective_captured,
-                        "player_stat": self.match.add_player_stat,
-                        "point_progress": self.match.add_objective_progress,
-                        "payload_progress": self.match.add_objective_progress,
+                        "kill": self.map.add_kill,
+                        "ultimate_charged": self.map.add_ultimate_charged,
+                        "ultimate_start": self.map.add_ultimate_start,
+                        "ultimate_end": self.map.add_ultimate_end,
+                        "objective_captured": self.map.add_objective_captured,
+                        "player_stat": self.map.add_player_stat,
+                        "point_progress": self.map.add_objective_progress,
+                        "payload_progress": self.map.add_objective_progress,
                         }
 
     def process_hero_spawn(self, data):
 
         player_data = {"time": data[2], "team_name": data[3], "player_name": data[4], "character_name": data[5]}
-        self.match.add_player(player_data)
+        self.map.add_player(player_data)
 
     def process_hero_swap(self, data):
 
         hero_data = {"time": data[2], "team_name": data[3], "player_name": data[4], "character_name": data[5], "character_swap": data[6]}
-        self.match.add_hero_swap(hero_data)
+        self.map.add_hero_swap(hero_data)
 
     def convert_timefile_to_datetime(self, time_string):
 

src/log_analyser/objects/match.py src/log_analyser/objects/map.pysrc/log_analyser/objects/match.py renamed to src/log_analyser/objects/map.py

@@ -4,7 +4,7 @@
 from datetime import datetime
 
 
-class Match(Object):
+class Map(Object):
 
     def __init__(self, **kwargs):
 
@@ -152,9 +152,9 @@ def end_round(self, data):
         self.score_team2 = end_round_data["score_team2"]
         print("###### END ROUND {} #######\n".format(self.actual_round))
 
-    def end_match(self, data):
+    def end_map(self, data):
 
-        end_match_data = {"time": data[2], "score_team1": data[4], "score_team2": data[5]}
+        end_map_data = {"time": data[2], "score_team1": data[4], "score_team2": data[5]}
 
-        self.score_team1 = end_match_data["score_team1"]
-        self.score_team2 = end_match_data["score_team2"]
+        self.score_team1 = end_map_data["score_team1"]
+        self.score_team2 = end_map_data["score_team2"]

src/log_analyser/objects/object.py

@@ -31,7 +31,7 @@ def export_json_recursive(self, data):
             dict_class_final = dict_class.copy()
 
             for key, value in dict_class.items():
-                if not key in data.class_model:
+                if not key in data.class_model and key != "class_name":
                     dict_class_final.pop(key)
 
             return data.export_json_recursive(dict_class_final)
@@ -51,7 +51,7 @@ def export_json(self):
         dict_class_final = dict_class.copy()
 
         for key, value in dict_class.items():
-            if not key in self.class_model:
+            if not key in self.class_model and key != "class_name":
                 dict_class_final.pop(key)
             else:
                 dict_class_final[key] = self.export_json_recursive(value)

src/main.py

@@ -24,13 +24,12 @@ def on_callback_test(self, topic, data):
 
         la = LogAnalyser('logs/Log-2023-12-22-21-12-32.txt', "Log-2023-12-22-21-12-32.txt")
         la.run()
-        a = la.match.export_json()
-        self.producer_thread.send("analyse.report", la.match.export_json())
+        self.producer_thread.send("analyse.report", la.map.export_json())
 
     def run(self):
 
         while self.running:
-            print("Service en cours d'exécution...")
+            # print("Service en cours d'exécution...")
             time.sleep(1)
 
         print("Service stop.")