Cerulean-Blue/Halyde
3
2
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

made stuff more verbose

Browse Source 
and also fixed modload using an outdated variant of the log library
This commit is contained in:
Ponali
2025-09-21 18:41:41 +02:00
parent 39897457f9
commit cf26f610b4
2 changed files with 170 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
halyde/kernel/modload.lua
+48 -40
View File
@@ -8,50 +8,58 @@ local modules = {}
local moduleTypes = {}
local function loadModule(modName)
local moduleData = modules[modName]
table.remove(moduleList, table.find(moduleList, modName))
if not moduleData then return end
if not moduleData.check() then
return
end
if moduleData.dependencies then
for _, dependency in pairs(moduleData.dependencies) do
if table.find(moduleList, dependency) then
loadModule(dependency)
elseif table.find(moduleList, dependency .. ".lua") then
loadModule(dependency .. ".lua")
else
for typeLookupDrvName, typeLookupDrvType in pairs(moduleTypes) do
if typeLookupDrvType == dependency then
loadModule(typeLookupDrvName)
-- Don't break, because there can be multiple modules of the correct type
end
end
end
end
end
--print(modName)
if moduleData.init then -- I have no idea why this would not exist, but it's a failsafe
moduleData.init()
end
local moduleData = modules[modName]
table.remove(moduleList, table.find(moduleList, modName))
if not moduleData then
log.kernel.warn(string.format("[modload: %s] Could not find module data.", modName))
return
end
if not moduleData.check() then
log.kernel.info(string.format("[modload: %s] Module not ready - skipping", modName))
return
end
if moduleData.dependencies then
for _, dependency in pairs(moduleData.dependencies) do
if table.find(moduleList, dependency) then
loadModule(dependency)
elseif table.find(moduleList, dependency .. ".lua") then
loadModule(dependency .. ".lua")
else
for typeLookupDrvName, typeLookupDrvType in pairs(moduleTypes) do
if typeLookupDrvType == dependency then
loadModule(typeLookupDrvName)
-- Don't break, because there can be multiple modules of the correct type
end
end
end
end
end
--print(modName)
log.kernel.info(string.format("[modload: %s] Loading module", modName))
if moduleData.init then -- I have no idea why this would not exist, but it's a failsafe
moduleData.init()
end
end
for _, modName in pairs(moduleList) do -- Get all the module types
local moduleData = require(fs.concat(modulePath, modName)) -- TODO: Make this not actually throw an error, rather put something in the log and move on
if type(moduleData)~="table" then
log.add(string.format("[modload: %s] Module returned invalid type (%s) - skipping",modName,type(moduleData)),"error")
goto continue
end
modules[modName]=moduleData
if moduleData.type then
--print(moduleData.type)
moduleTypes[modName] = moduleData.type -- Not the other way around because there can be multiple modules of the same type, but there can't be multiple entries with the same key
end
::continue::
log.kernel.info(string.format("[modload: %s] Getting data from module", modName))
local moduleData = require(fs.concat(modulePath, modName)) -- TODO: Make this not actually throw an error, rather put something in the log and move on
if type(moduleData) ~= "table" then
log.kernel.error(
string.format("[modload: %s] Module returned invalid type (%s) - skipping", modName, type(moduleData))
)
goto continue
end
modules[modName] = moduleData
if moduleData.type then
--print(moduleData.type)
moduleTypes[modName] = moduleData.type -- Not the other way around because there can be multiple modules of the same type, but there can't be multiple entries with the same key
end
::continue::
end
while moduleList[1] do
if moduleList[1]:sub(-1, -1) ~= "/" then -- Check if it's not a directory. If it is, it might be module config
loadModule(moduleList[1])
end
if moduleList[1]:sub(-1, -1) ~= "/" then -- Check if it's not a directory. If it is, it might be module config
loadModule(moduleList[1])
end
end