teatov/keebie
teatov/keebie
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

replace file path to file name in error messages

Browse Source
This commit is contained in:
Teatov 2025-08-02 01:28:43 +10:00
parent 3221c26769
commit 95f74d10cc
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/layouts/layout_custom.gd
View File

@ -4,21 +4,23 @@ var has_errors: bool = false
var _name: String var _name: String
var _rows: Array[Array] var _rows: Array[Array]
var _file_name: String
func _init(json_path: String) -> void: func _init(path: String) -> void:
_name = json_path.get_file() _file_name = path.get_file()
_name = _file_name
var data: Variant = _load_json_file(json_path) var data: Variant = _load_json_file(path)
if not data: if not data:
has_errors = true has_errors = true
printerr("ERROR LOADING KLE LAYOUT JSON: '%s'" % json_path) printerr("ERROR LOADING KLE LAYOUT JSON: '%s'" % _file_name)
return return
var layout_rows := _deserialize(data) var layout_rows := _deserialize(data, _file_name)
if not layout_rows: if not layout_rows:
has_errors = true has_errors = true
printerr("ERROR DESERIALIZING KLE LAYOUT: '%s'" % json_path) printerr("ERROR DESERIALIZING KLE LAYOUT: '%s'" % _file_name)
return return
_rows = layout_rows _rows = layout_rows
@ -37,9 +39,9 @@ func _load_json_file(path: String) -> Variant:
if not file: if not file:
var file_err := FileAccess.get_open_error() var file_err := FileAccess.get_open_error()
if file_err == ERR_FILE_NOT_FOUND: if file_err == ERR_FILE_NOT_FOUND:
printerr("file not found '%s'" % path) printerr("file not found '%s'" % _file_name)
else: else:
printerr("error opening file '%s': %s" % [path, file_err]) printerr("error opening file '%s': %s" % [_file_name, file_err])
return [] return []
var content := file.get_as_text() var content := file.get_as_text()
@ -49,7 +51,7 @@ func _load_json_file(path: String) -> Variant:
printerr( printerr(
( (
"json parse error in '%s' at line %s: %s" "json parse error in '%s' at line %s: %s"
% [path, json.get_error_line(), json.get_error_message()] % [_file_name, json.get_error_line(), json.get_error_message()]
) )
) )
return [] return []
@ -59,10 +61,10 @@ func _load_json_file(path: String) -> Variant:
return data return data
func _deserialize(data: Variant) -> Array[Array]: func _deserialize(data: Variant, path: String) -> Array[Array]:
var parser: AbstractParser var parser: AbstractParser
if data is Array: if data is Array:
parser = ParserKLE.new(data as Array) parser = ParserKLE.new(data as Array, path)
else: else:
return [] return []
if parser.get_name() != "": if parser.get_name() != "":

12
scripts/layouts/parser_kle.gd
View File

@ -65,7 +65,7 @@ const LABEL_TO_NUMPAD_KEYCODE_MAP: Dictionary[String, Key] = {
".": KEY_KP_PERIOD, ".": KEY_KP_PERIOD,
} }
const NAME := "_name" const NAME := "name"
const W := "w" const W := "w"
const H := "h" const H := "h"
@ -86,11 +86,13 @@ const N := "n"
const KEY_DICT := "key_dict" const KEY_DICT := "key_dict"
const POS := "pos" const POS := "pos"
var _name: String = "" var _name: String
var _rows: Array[Array] = [] var _rows: Array[Array]
var _file_name: String
func _init(data: Array) -> void: func _init(data: Array, file_name: String) -> void:
_file_name = file_name
var key_pos_dicts: Dictionary[Key, Array] = {} var key_pos_dicts: Dictionary[Key, Array] = {}
var row_index: int = 0 var row_index: int = 0
@ -221,7 +223,7 @@ func _get_keycode_from_legend(legend: Array[String], data_key: Dictionary) -> Ke
break break
if keycode == KEY_NONE: if keycode == KEY_NONE:
printerr("%s: could not recognize key label %s" % [_name, str(legend)]) printerr("%s: could not recognize key label %s" % [_file_name, str(legend)])
return keycode return keycode