Skip to content

Commit 7d2f696

Browse files
Qubus0GDami
authored andcommitted
feat: log name wildcards (#331)
* feat: log name wildcards * refactor: use trim_suffix instead of replace * fix: bad rename
1 parent cd22903 commit 7d2f696

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

addons/mod_loader/api/log.gd

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -385,15 +385,27 @@ static func _log(message: String, mod_name: String, log_type: String = "info", o
385385
_write_to_log_file(log_entry.get_entry())
386386

387387

388-
static func _is_mod_name_ignored(mod_name: String) -> bool:
388+
static func _is_mod_name_ignored(mod_log_name: String) -> bool:
389389
if not ModLoaderStore:
390390
return false
391391

392-
var ignored_mod_names := ModLoaderStore.ml_options.ignored_mod_names_in_log as Array
392+
var ignored_mod_log_names := ModLoaderStore.ml_options.ignored_mod_names_in_log as Array
393393

394-
if not ignored_mod_names.size() == 0:
395-
if mod_name in ignored_mod_names:
396-
return true
394+
# No ignored mod names
395+
if ignored_mod_log_names.size() == 0:
396+
return false
397+
398+
# Directly match a full mod log name. ex: "ModLoader:Deprecated"
399+
if mod_log_name in ignored_mod_log_names:
400+
return true
401+
402+
# Match a mod log name with a wildcard. ex: "ModLoader:*"
403+
for ignored_mod_name in ignored_mod_log_names:
404+
if ignored_mod_name.ends_with("*"):
405+
if mod_log_name.begins_with(ignored_mod_name.trim_suffix("*")):
406+
return true
407+
408+
# No match
397409
return false
398410

399411

addons/mod_loader/mod_loader.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ signal logged(entry)
2424
signal current_config_changed(config)
2525

2626
# Prefix for this file when using mod_log or dev_log
27-
const LOG_NAME := "ModLoader"
27+
const LOG_NAME := "ModLoader:Loader"
2828

2929
# --- DEPRECATED ---
3030
# UNPACKED_DIR was moved to ModLoaderStore.

0 commit comments

Comments
 (0)