len0rd/Concord
1
0
Fork 0
mirror of https://github.com/Keyslam-Group/Concord.git synced 2025-09-02 20:33:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #66 from wolfboyft/master

Browse source 
Fix bug where loading namespaces using folder/init.lua entries would only work if "folder" was 3 characters
This commit is contained in:
Justin van der Leij 2022-10-17 21:53:30 +02:00 • committed by GitHub
commit a45d89457b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
concord/utils.lua
View file

@ -34,11 +34,18 @@ function Utils.loadNamespace(pathOrFiles, namespace)
local files = love.filesystem.getDirectoryItems(pathOrFiles) local files = love.filesystem.getDirectoryItems(pathOrFiles)
for _, file in ipairs(files) do for _, file in ipairs(files) do
local name = file:sub(1, #file - 4) local isFile = love.filesystem.getInfo(pathOrFiles .. "/" .. file).type == "file"
local path = pathOrFiles.."."..name
local value = require(path) if isFile then
if namespace then namespace[name] = value end local name = file:sub(1, #file - 4)
local path = pathOrFiles.."."..name
local value = require(path)
if namespace then namespace[name] = value end
else
local value = require(pathOrFiles.."."..file)
if namespace then namespace[file] = value end
end
end end
elseif (type(pathOrFiles == "table")) then elseif (type(pathOrFiles == "table")) then
for _, path in ipairs(pathOrFiles) do for _, path in ipairs(pathOrFiles) do
@ -61,4 +68,4 @@ function Utils.loadNamespace(pathOrFiles, namespace)
return namespace return namespace
end end
return Utils return Utils