diff --git a/code/modules/whitelist/whitelist.dm b/code/modules/whitelist/whitelist.dm index bea2b0e64a..d93a3b08ad 100644 --- a/code/modules/whitelist/whitelist.dm +++ b/code/modules/whitelist/whitelist.dm @@ -35,7 +35,7 @@ var/list/whitelistable = list( return (ckey in global.whitelists) ? global.whitelists[ckey] : list() -/proc/load_whitelist(var/key) +/proc/load_whitelist() var/filename = "config/whitelists.json" try if(fexists(filename)) diff --git a/tools/whitelistupdate5000.py b/tools/whitelistupdate5000.py index 8d12935ffc..0c71148a35 100644 --- a/tools/whitelistupdate5000.py +++ b/tools/whitelistupdate5000.py @@ -4,13 +4,18 @@ import json def scan_whitelist(): whitelist_dict = {} path = "../data/player_saves" - for subdir in os.listdir(path): + for subdir in os.listdir(path): path = f"../data/player_saves/{subdir}" + if not os.path.isdir(path): + continue for player_dir in os.listdir(path): whitelist_file = f"{path}/{player_dir}/whitelist.json" + print(f"Opening {whitelist_file}") if not os.path.exists(whitelist_file): continue with open(whitelist_file) as contents: + if os.path.getsize(whitelist_file) == 1: + continue whitelist_dict[player_dir] = [] for key in json.load(contents): whitelist_dict[player_dir].append(translate_key(key))