Skip to content

feat: basic zip loading #985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
WilsontheWolf wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: basic zip loading #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions libs/nativefs/nativefs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,4 +492,52 @@ else
end
end


local redirects = {}

function nativefs.smodsAddRedirect(realPath, lfsPath)
if redirects[realPath] then return false, 'A redirect with path "' .. realPath .. '" already exists' end
redirects[realPath] = lfsPath
return true
end

local function getRedirectPath(realPath)
for p, r in pairs(redirects) do
local len = #p
local sub = realPath:sub(0, len + 1)
if sub == p then return r end
if sub == p .. "/" then return r .. "/" .. realPath:sub(len + 2) end
end
return false
end

local function patchSimple(n, l) -- Simple funcions always have the path as the first argument
return function (path, ...)
local red = getRedirectPath(path)
if red then return l(red, ...) end
return n(path, ...)
end
end

for _, v in ipairs{"newFile", "unmount", "write", "append", "lines", "load", "getDirectoryItems", "getInfo", "createDirectory", "remove", "mount", "newFileData"} do
nativefs[v] = patchSimple(nativefs[v], love.filesystem[v])
end
nativefs.getDirectoryItemsInfo = patchSimple(nativefs.getDirectoryItemsInfo, getDirectoryItemsInfo)

do
local nRead = nativefs.read
local lRead = love.filesystem.read
function nativefs.read(containerOrName, nameOrSize, sizeOrNil)
if sizeOrNil then -- Container defined
local red = getRedirectPath(nameOrSize)
if red then return lRead(containerOrName, red, sizeOrNil) end
return nRead(containerOrName, nameOrSize, sizeOrNil)
else
local red = getRedirectPath(containerOrName)
if red then return lRead(red, nameOrSize, sizeOrNil) end
return nRead(containerOrName, nameOrSize, sizeOrNil)
end
end
end

return nativefs
5 changes: 5 additions & 0 deletions src/loader.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,11 @@ function loadMods(modsDirectory)
elseif depth == 2 and filename == "lovely.toml" and not isDirLovely then
isDirLovely = true
table.insert(lovely_directories, directory .. "/")
elseif depth == 1 and filename:lower():match("%.zip") then
local loveName = "__SMODS_MOUNTS__/" .. filename
assert(NFS.mount(file_path, loveName))
assert(NFS.smodsAddRedirect(file_path .. ".mnt", loveName))
processDirectory(file_path .. ".mnt", depth + 1)
elseif filename:lower():match('%.json') and depth > 1 then
local json_str = NFS.read(file_path)
local parsed, mod = pcall(JSON.decode, json_str)
Expand Down