Mirrorlandia_minetest/Minetest-WorldEdit
1
0
Fork 0
mirror of https://github.com/Uberi/Minetest-WorldEdit.git synced 2025-01-09 22:37:35 +01:00
Code Issues Projects Releases Wiki Activity

Improve loading and error handling for schematics

Browse Source
This commit is contained in:
sfan5 2023-06-07 11:41:10 +02:00
parent 9417f2bbf1
commit 7a645eba05
1 changed files with 44 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
worldedit_commands/init.lua
View File

@ -226,6 +226,39 @@ local function check_filename(name)
return name:find("^[%w%s%^&'@{}%[%],%$=!%-#%(%)%%%.%+~_]+$") ~= nil return name:find("^[%w%s%^&'@{}%[%],%$=!%-#%(%)%%%.%+~_]+$") ~= nil
end end
local function open_schematic(name, param)
-- find the file in the world path
local testpaths = {
minetest.get_worldpath() .. "/schems/" .. param,
minetest.get_worldpath() .. "/schems/" .. param .. ".we",
minetest.get_worldpath() .. "/schems/" .. param .. ".wem",
}
local file, err
for index, path in ipairs(testpaths) do
file, err = io.open(path, "rb")
if not err then
break
end
end
if err then
worldedit.player_notify(name, "Could not open file \"" .. param .. "\"")
return
end
local value = file:read("*a")
file:close()
local version = worldedit.read_header(value)
if version == nil or version == 0 then
worldedit.player_notify(name, "File is invalid!")
return
elseif version > worldedit.LATEST_SERIALIZATION_VERSION then
worldedit.player_notify(name, "Schematic was created with a newer version of WorldEdit.")
return
end
return value
end
worldedit.register_command("about", { worldedit.register_command("about", {
privs = {}, privs = {},
@ -1415,28 +1448,15 @@ worldedit.register_command("allocate", {
func = function(name, param) func = function(name, param)
local pos = worldedit.pos1[name] local pos = worldedit.pos1[name]
local filename = minetest.get_worldpath() .. "/schems/" .. param .. ".we" local value = open_schematic(name, param)
local file, err = io.open(filename, "rb") if not value then
if err ~= nil then return false
worldedit.player_notify(name, "could not open file \"" .. filename .. "\"")
return
end end
local value = file:read("*a")
file:close()
local version = worldedit.read_header(value)
if version == nil or version == 0 then
worldedit.player_notify(name, "File is invalid!")
return
elseif version > worldedit.LATEST_SERIALIZATION_VERSION then
worldedit.player_notify(name, "File was created with newer version of WorldEdit!")
return
end
local nodepos1, nodepos2, count = worldedit.allocate(pos, value) local nodepos1, nodepos2, count = worldedit.allocate(pos, value)
if not nodepos1 then if not nodepos1 then
worldedit.player_notify(name, "Schematic empty, nothing allocated") worldedit.player_notify(name, "Schematic empty, nothing allocated")
return return false
end end
worldedit.pos1[name] = nodepos1 worldedit.pos1[name] = nodepos1
@ -1464,46 +1484,16 @@ worldedit.register_command("load", {
func = function(name, param) func = function(name, param)
local pos = worldedit.pos1[name] local pos = worldedit.pos1[name]
if param == "" then local value = open_schematic(name, param)
worldedit.player_notify(name, "invalid usage: " .. param) if not value then
return return false
end
if not string.find(param, "^[%w \t.,+-_=!@#$%%^&*()%[%]{};'\"]+$") then
worldedit.player_notify(name, "invalid file name: " .. param)
return
end
--find the file in the world path
local testpaths = {
minetest.get_worldpath() .. "/schems/" .. param,
minetest.get_worldpath() .. "/schems/" .. param .. ".we",
minetest.get_worldpath() .. "/schems/" .. param .. ".wem",
}
local file, err
for index, path in ipairs(testpaths) do
file, err = io.open(path, "rb")
if not err then
break
end
end
if err then
worldedit.player_notify(name, "could not open file \"" .. param .. "\"")
return
end
local value = file:read("*a")
file:close()
local version = worldedit.read_header(value)
if version == nil or version == 0 then
worldedit.player_notify(name, "File is invalid!")
return
elseif version > worldedit.LATEST_SERIALIZATION_VERSION then
worldedit.player_notify(name, "File was created with newer version of WorldEdit!")
return
end end
local count = worldedit.deserialize(pos, value) local count = worldedit.deserialize(pos, value)
if count == nil then
worldedit.player_notify(name, "Loading failed!")
return false
end
worldedit.player_notify(name, count .. " nodes loaded") worldedit.player_notify(name, count .. " nodes loaded")
end, end,
}) })