vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance logs categories + debug + clean various

Browse Source
This commit is contained in:
Adrien Ufferte
2025-05-22 17:01:38 +02:00
parent ca99391868
commit 38bd202aac
8 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/user/user_remediation.gd
+1 -1
View File
@@ -27,7 +27,7 @@ func get_gp_score(ID: int) -> int:
func update_gp_scores(minigame_scores: Dictionary) -> void:
if not minigame_scores:
return
Logger.debug("UserRemediation: Update GP Scores: " + str(minigame_scores))
Logger.trace("UserRemediation: Update GP Scores: " + str(minigame_scores))
for ID: int in minigame_scores.keys():
var new_gp_score: int = 0
if gps_scores.has(ID):
sources/language_tool/prof_tool_menu.gd
+3 -3
View File
@@ -163,7 +163,7 @@ func _check_db_integrity() -> void:
lesson_id = index +1
error_label.text = "Database integrity checks lesson " + str(lesson_id)
await get_tree().process_frame
Logger.debug("ProfToolMenu: Lesson_id = " + str(lesson_id))
Logger.trace("ProfToolMenu: Lesson_id = " + str(lesson_id))
var new_GPs_for_lesson: Array = Database.get_GP_for_lesson(lesson_id, false, true, false, false, true)
for new_GP: Dictionary in new_GPs_for_lesson:
@@ -241,7 +241,7 @@ func _check_db_integrity() -> void:
integrity_checking = false
if check_box_log.button_pressed:
var file_path: String = ProjectSettings.globalize_path(integrity_log_path)
Logger.debug("ProfToolMenu: Logs saved at " + file_path)
Logger.trace("ProfToolMenu: Logs saved at " + file_path)
OS.shell_open(file_path)
#endregion
@@ -590,7 +590,7 @@ func create_book() -> void:
output_file.close()
error_label.text = "📘 Export des données du livret terminé vers : " + output_path
Logger.debug("ProfToolMenu: " + error_label.text)
Logger.trace("ProfToolMenu: " + error_label.text)
# Fonction qui ajoute une ligne au dictionnaire
func add_row(dict: Dictionary[String, PackedStringArray], row_data: Dictionary[String, String], categorie: String, all_headers: Array) -> void:
sources/menus/brain/brain.gd
+1
View File
@@ -100,6 +100,7 @@ func _ready() -> void:
if not UserDataManager.is_speech_played("brain"):
_play_tutorial()
func _play_tutorial() -> void:
var tutorial_count: int = 0
sources/menus/register/steps/account_type_step.tscn
+6 -3
View File
@@ -1,11 +1,11 @@
[gd_scene load_steps=11 format=3 uid="uid://c73wkbttv0ou0"]
[ext_resource type="PackedScene" uid="uid://bxd3i06rqpxf0" path="res://sources/menus/register/steps/base_step.tscn" id="1_g51ml"]
[ext_resource type="Script" uid="uid://dg4qit8mffvjh" path="res://addons/godot-form-validator/control_validator.gd" id="2_hidu6"]
[ext_resource type="Script" uid="uid://b23qfes63s2no" path="res://addons/godot-form-validator/control_validator.gd" id="2_hidu6"]
[ext_resource type="Script" uid="uid://b3lqs6b6vj57r" path="res://sources/menus/register/steps/account_type_step.gd" id="2_k6524"]
[ext_resource type="Script" uid="uid://dw5aercmfe4" path="res://addons/godot-form-validator/rules/required_rule.gd" id="3_54aao"]
[ext_resource type="Script" uid="uid://b0dbsne0vdlsi" path="res://addons/godot-form-validator/rules/required_rule.gd" id="3_54aao"]
[ext_resource type="Script" uid="uid://83q48kwp3p6p" path="res://sources/menus/register/steps/validation/item_list_validator.gd" id="4_bdvqa"]
[ext_resource type="Script" uid="uid://dg17cfvs2w257" path="res://addons/godot-form-validator/rules/validator_rule.gd" id="4_n022u"]
[ext_resource type="Script" uid="uid://bsai1004ag8h6" path="res://addons/godot-form-validator/rules/validator_rule.gd" id="4_n022u"]
[ext_resource type="Script" uid="uid://7uwoocpe7ieu" path="res://sources/utils/binder/control_binder.gd" id="5_w7o0m"]
[ext_resource type="LabelSettings" uid="uid://ohvlqccl2oog" path="res://resources/themes/error_label_settings.tres" id="7_kjn8t"]
@@ -50,6 +50,9 @@ layout_mode = 2
theme_override_font_sizes/font_size = 70
allow_search = false
auto_height = true
item_count = 2
item_0/text = "TEACHER"
item_1/text = "PARENT"
[node name="ControlValidator" type="Node" parent="FormValidator/FormBinder/Control/Background/FormMargin/FormContainer/TypeContainer/VBoxContainer/TypeSelect" index="2"]
script = ExtResource("2_hidu6")
sources/minigames/penguin/penguin_minigame.gd
+1 -1
View File
@@ -76,7 +76,7 @@ func _find_stimuli_and_distractions() -> void:
for sentence: Dictionary in stimuli:
sentence.GPs = Database.get_GPs_from_sentence(sentence.ID as int)
Logger.debug("PenguinMinigame: Stimuli: %s" % str(stimuli))
Logger.trace("PenguinMinigame: Stimuli: %s" % str(stimuli))
# Launch the minigame
sources/minigames/turtles/turtles_minigame.gd
+1 -1
View File
@@ -64,7 +64,7 @@ func _setup_minigame() -> void:
spawn_timer.wait_time = settings.spawn_rate
for s: Dictionary in stimuli:
Logger.debug("TurtleMinigame: %s" % s.Word)
Logger.trace("TurtleMinigame: %s" % s.Word)
func _highlight() -> void:
sources/utils/autoloads/Logger.gd
+3
View File
@@ -111,8 +111,11 @@ func _log_to_file(message: String) -> void:
log_file.flush()
# Sugar functions
# trace can be used everywhere, in ordre to have a full log of all that is hapenning
func trace(msg: String) -> void: _log_internal(LogLevel.TRACE, msg)
# debug should only be used in a dev environment to track a specific bug.
func debug(msg: String) -> void: _log_internal(LogLevel.DEBUG, msg)
# info can carry important informations that should always be logged but that are not problematic
func info(msg: String) -> void: _log_internal(LogLevel.INFO, msg)
func warn(msg: String) -> void: _log_internal(LogLevel.WARNING, msg)
func error(msg: String) -> void: _log_internal(LogLevel.ERROR, msg)
sources/utils/autoloads/server_manager.gd
+14 -12
View File
@@ -119,7 +119,7 @@ func set_student_data(student_code: int, data: Dictionary) -> Dictionary:
#region Sender functions
func check_internet_access() -> bool:
Logger.debug("ServerManager Sending simple request to " + INTERNET_CHECK_URL + " to check if internet is available")
Logger.trace("ServerManager Sending simple request to " + INTERNET_CHECK_URL + " to check if internet is available")
var res: Error = internet_check.request(INTERNET_CHECK_URL)
if res == OK:
return await internet_check_completed
@@ -167,9 +167,9 @@ func _get_request(URI: String, params: Dictionary) -> void:
resetResult()
var headers: PackedStringArray = _create_request_headers()
if params.has("password"):
Logger.debug("ServerManager Sending GET request.\n URI = %s\n Parameters not logged because it contains a password." % URI)
Logger.trace("ServerManager Sending GET request.\n URI = %s\n Parameters not logged because it contains a password." % URI)
else:
Logger.debug("ServerManager Sending GET request.\n URI = %s\n Parameters = %s" % [URI, params])
Logger.trace("ServerManager Sending GET request.\n URI = %s\n Parameters = %s" % [URI, params])
if http_request.request(_create_URI_with_parameters(environment_url + URI, params), headers) == OK:
await request_completed
else:
@@ -183,9 +183,9 @@ func _post_request(URI: String, params: Dictionary) -> void:
var url: String = _create_URI_with_parameters(environment_url + URI, params)
var headers: PackedStringArray = _create_request_headers()
if params.has("password"):
Logger.debug("ServerManager Sending POST request.\n URI = %s\n Parameters not logged because it contains a password." % URI)
Logger.trace("ServerManager Sending POST request.\n URI = %s\n Parameters not logged because it contains a password." % URI)
else:
Logger.debug("ServerManager Sending POST request.\n URI = %s\n Parameters = %s" % [URI, params])
Logger.trace("ServerManager Sending POST request.\n URI = %s\n Parameters = %s" % [URI, params])
if http_request.request(url, headers, HTTPClient.METHOD_POST, "") == OK:
await request_completed
else:
@@ -199,9 +199,9 @@ func _post_json_request(URI: String, data: Dictionary) -> void:
var req: String = environment_url + URI
var headers: PackedStringArray = _create_request_headers(true)
if data.has("password"):
Logger.debug("ServerManager sending POST JSON request.\n URI = %s\n Data not logged because it contains a password." % URI)
Logger.trace("ServerManager sending POST JSON request.\n URI = %s\n Data not logged because it contains a password." % URI)
else:
Logger.debug("ServerManager Sending POST JSON request.\n URI = %s\n Data = %s" % [URI, data])
Logger.trace("ServerManager Sending POST JSON request.\n URI = %s\n Data = %s" % [URI, data])
if http_request.request(req, headers, HTTPClient.METHOD_POST, JSON.stringify(data)) == OK:
await request_completed
else:
@@ -214,7 +214,7 @@ func _delete_request(URI: String, params: Dictionary = {}) -> void:
resetResult()
var req: String = _create_URI_with_parameters(environment_url + URI, params)
var headers: PackedStringArray = _create_request_headers()
Logger.debug("ServerManager Sending DELETE request.\n URI = %s\n Parameters = %s" % [URI, params])
Logger.trace("ServerManager Sending DELETE request.\n URI = %s\n Parameters = %s" % [URI, params])
if http_request.request(req, headers, HTTPClient.METHOD_DELETE, "") == OK:
await request_completed
else:
@@ -226,15 +226,17 @@ func _delete_request(URI: String, params: Dictionary = {}) -> void:
func _on_http_request_request_completed(result_code: int, response_code: int, _headers: PackedStringArray, body: PackedByteArray) -> void:
if result_code != OK:
Logger.debug("Cannot complete http request. Error code %d = %s" % [result_code, error_string(result_code)])
Logger.trace("Cannot complete http request. Error code %d = %s" % [result_code, error_string(result_code)])
else:
code = response_code
if body:
Logger.debug("ServerManager Request Completed.\n Response code = %d\n Body received = %s" % [response_code, body.get_string_from_utf8()])
Logger.trace("ServerManager Request Completed.\n Response code = %d\n Body received = %s" % [response_code, body.get_string_from_utf8()])
var strBody: String = body.get_string_from_utf8()
var result: Variant = JSON.parse_string(strBody)
if result != null:
json = result
else:
Logger.trace("ServerManager: result null after parsing String to JSON")
success = result_code == OK and response_code == 200
request_completed.emit(success, response_code, json)
loading_rect.hide()
@@ -242,9 +244,9 @@ func _on_http_request_request_completed(result_code: int, response_code: int, _h
func _on_internet_check_request_completed(result_code: int, response_code: int, _headers: PackedStringArray, _body: PackedByteArray) -> void:
if result_code != OK:
Logger.debug("Cannot check internet request. Error code %d = %s" % [result_code, error_string(result_code)])
Logger.trace("Cannot check internet request. Error code %d = %s" % [result_code, error_string(result_code)])
else:
Logger.debug("ServerManager Internet check completed.\n Response code = %s. (200 = OK)" % str(response_code))
Logger.trace("ServerManager Internet check completed.\n Response code = %s. (200 = OK)" % str(response_code))
success = result_code == OK and response_code == 200
internet_check_completed.emit(success)