refactor score_team to team_score

add event from back in service for launch log_analyser

Author: Zat-Code

src/log_analyser/log_analyser.py

@@ -5,10 +5,11 @@
 
 class LogAnalyser:
 
-    def __init__(self, path_csv, name) -> None:
+    def __init__(self, path, name, team_id) -> None:
 
-        self.path_csv = path_csv
+        self.path_csv = "{}/{}".format(path, name)
         self.name = name
+        self.team_id = team_id
 
         self.date = self.name2datetime()
 
@@ -48,8 +49,9 @@ def process_map_start(self, data):
                        "map_type": data[4],
                        "team1_name": data[5],
                        "team2_name": data[6],
-                       "score_team1": 0,
-                       "score_team2": 0,
+                       "team1_score": 0,
+                       "team2_score": 0,
+                       "team_id": self.team_id
                        })
 
         self.actions = {"match_start": self.process_map_start,

src/log_analyser/objects/map.py

@@ -14,8 +14,9 @@ def __init__(self, **kwargs):
                        "map_type": str,
                        "team1_name": str,
                        "team2_name": str,
-                       "score_team1": int,
-                       "score_team2": int,
+                       "team1_score": int,
+                       "team2_score": int,
+                       "team_id": str
                        }
 
         super().__init__(data_schema, **kwargs)
@@ -139,7 +140,7 @@ def add_objective_progress(self, data):
 
     def end_round(self, data):
 
-        end_round_data = {"time": data[2], "score_team1": data[5], "score_team2": data[6]}
+        end_round_data = {"time": data[2], "team1_score": data[5], "team2_score": data[6]}
 
         for team in self.rounds[self.actual_round].teams:
             for player in self.rounds[self.actual_round].teams[team].players:
@@ -148,13 +149,13 @@ def end_round(self, data):
                         self.rounds[self.actual_round].teams[team].players[player].characters[character].played_time[-1]["end"] = end_round_data["time"]
 
 
-        self.score_team1 = end_round_data["score_team1"]
-        self.score_team2 = end_round_data["score_team2"]
+        self.score_team1 = end_round_data["team1_score"]
+        self.score_team2 = end_round_data["team2_score"]
         print("###### END ROUND {} #######\n".format(self.actual_round))
 
     def end_map(self, data):
 
-        end_map_data = {"time": data[2], "score_team1": data[4], "score_team2": data[5]}
+        end_map_data = {"time": data[2], "team1_score": data[4], "team2_score": data[5]}
 
-        self.score_team1 = end_map_data["score_team1"]
-        self.score_team2 = end_map_data["score_team2"]
+        self.score_team1 = end_map_data["team1_score"]
+        self.score_team2 = end_map_data["team2_score"]

src/log_analyser/objects/object.py

@@ -56,7 +56,7 @@ def export_json(self):
             else:
                 dict_class_final[key] = self.export_json_recursive(value)
         # return json.dumps(dict_class_final, indent=4, sort_keys=True, default=str)
-        return json.dumps(dict_class_final, skipkeys=False, ensure_ascii=True, check_circular=True)
+        return dict_class_final
     def convert_timefile_to_datetime(self, time_string):
 
 

src/main.py

@@ -22,10 +22,24 @@ def __init__(self):
     def on_callback_test(self, topic, data):
         print("message receive : ", topic, data)
 
-        la = LogAnalyser('logs/Log-2023-12-22-21-12-32.txt', "Log-2023-12-22-21-12-32.txt")
-        la.run()
-        self.producer_thread.send("analyse.report", la.map.export_json())
+        filePath = data["filePath"]
+        fileName = data["fileName"]
+        teamId = data["teamId"]
 
+        if self.check_txt_extension(fileName):
+
+            la = LogAnalyser(filePath, fileName, teamId)
+            la.run()
+            if la.map != None:
+                self.producer_thread.send("analyse.report", la.map.export_json())
+            else:
+                self.producer_thread.send("analyse.report", {"error": "File txt not correct"})
+
+        else:
+            self.producer_thread.send("analyse.report", {"error": "File extension not correct"})
+
+    def check_txt_extension(self, filename):
+        return filename.lower().endswith('.txt')
     def run(self):
 
         while self.running: