bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Prevent re-applications when adding file hooks or requiring files

Browse source
This commit is contained in:
Aussiemon 2023-01-08 03:39:55 -07:00
parent ffb4a3e020
commit 9a67740bf1
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
dmf/scripts/mods/dmf/modules/core/hooks.lua
View file

@ -36,7 +36,10 @@ local _hooks = {
setmetatable({}, auto_table_meta), -- safe setmetatable({}, auto_table_meta), -- safe
{}, -- origin {}, -- origin
} }
local _hooks_by_file = {}
local _file_hooks_by_file = {}
local _file_hooks_applied_to_file = {}
local _origs = {} local _origs = {}
-- #################################################################################################################### -- ####################################################################################################################
@ -397,21 +400,28 @@ end
-- original function at the end. Your handler has to call the next function in the chain manually. -- original function at the end. Your handler has to call the next function in the chain manually.
-- The chain of event is determined by mod load order. -- The chain of event is determined by mod load order.
function DMFMod:hook_file(obj_str, method_str, handler) function DMFMod:hook_file(obj_str, method_str, handler)
-- Add hook create function to list for the file
_hooks_by_file[obj_str] = _hooks_by_file[obj_str] or {} -- Set up the tables for the file
local mod_name = self:get_name()
_file_hooks_by_file[obj_str] = _file_hooks_by_file[obj_str] or {}
_file_hooks_applied_to_file[obj_str] = _file_hooks_applied_to_file[obj_str] or {[mod_name] = {}}
-- Add the hook create function to the file's table
local hook_create_func = function(this_filepath, this_index) local hook_create_func = function(this_filepath, this_index)
local dynamic_obj = self:get_require_store(this_filepath)[this_index] local dynamic_obj = self:get_require_store(this_filepath)[this_index]
return generic_hook(self, dynamic_obj, method_str, handler, "hook") return generic_hook(self, dynamic_obj, method_str, handler, "hook")
end end
table.insert(_hooks_by_file[obj_str], hook_create_func)
-- Index file hooks by mod name to prevent duplicates per mod
_file_hooks_by_file[obj_str][mod_name] = hook_create_func
-- Add the new hook to every instance of the file -- Add the new hook to every instance of the file
local all_file_instances = self:get_require_store(obj_str) local all_file_instances = self:get_require_store(obj_str)
if all_file_instances then if all_file_instances then
for i, item in ipairs(all_file_instances) do for i, item in ipairs(all_file_instances) do
if item then if item and not _file_hooks_applied_to_file[obj_str][mod_name][i] then
hook_create_func(obj_str, i) hook_create_func(obj_str, i)
_file_hooks_applied_to_file[obj_str][mod_name][i] = true
end end
end end
end end
@ -468,12 +478,11 @@ dmf.apply_delayed_hooks = function(status, state)
end end
dmf.apply_hooks_to_file = function(require_store, filepath, store_index) dmf.apply_hooks_to_file = function(require_store, filepath, store_index)
local all_file_hooks = _hooks_by_file[filepath] if _file_hooks_by_file[filepath] and require_store and require_store[store_index] then
local file_instance = require_store and require_store[store_index] for mod_name, hook_create_func in pairs(_file_hooks_by_file[filepath]) do
if not _file_hooks_applied_to_file[filepath][mod_name][store_index] then
if all_file_hooks and file_instance then hook_create_func(filepath, store_index)
for _, hook_create_func in ipairs(all_file_hooks) do end
hook_create_func(filepath, store_index)
end end
end end
end end