osmarks/wyvern
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make library actually export stuff

Browse Source
This commit is contained in:
osmarks 2018-07-26 12:47:35 +01:00
parent 807d414875
commit 5fcc632ce9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib.lua
View File

@ -17,6 +17,7 @@ local errors = {
NOITEMS = 3, -- No item errors should either provide a table of { type = "human-readable name if available or internal ID if not", quantity = number of items missing } or a human-readable string NOITEMS = 3, -- No item errors should either provide a table of { type = "human-readable name if available or internal ID if not", quantity = number of items missing } or a human-readable string
NORESPONSE = 4, -- No response errors (should only be produced by query_ functions may contain a description of which node the error is caused by in their data NORESPONSE = 4, -- No response errors (should only be produced by query_ functions may contain a description of which node the error is caused by in their data
NOMATCHINGNODE = 5, -- No matching node errors (should only be prodcuced by query_ functions) may contain a description of which type of node cannot be found. NOMATCHINGNODE = 5, -- No matching node errors (should only be prodcuced by query_ functions) may contain a description of which type of node cannot be found.
NOSPACE = 6, -- No data required. Should be returned if there is no available storage space.
make = function(e, d) make = function(e, d)
return { type = "error", error = e, data = d } return { type = "error", error = e, data = d }
end end
@ -24,7 +25,7 @@ local errors = {
-- Converts an error into human-readable format -- Converts an error into human-readable format
errors.format = function(e) errors.format = function(e)
if not (e.type and e.type == "error" and e.data and e.error) then return "Not actually an error." end if not (e.type and e.type == "error" and e.data and e.error) then return "Provided error is not an error object." end
if e.error == errors.INTERNAL then if e.error == errors.INTERNAL then
return "Internal error - provided info: " .. textutils.serialise(e.data) .. "." return "Internal error - provided info: " .. textutils.serialise(e.data) .. "."
elseif e.error == errors.INVALID then elseif e.error == errors.INVALID then
@ -50,6 +51,8 @@ errors.format = function(e)
else else
return "No node of desired type found." return "No node of desired type found."
end end
elseif e.errors == errors.NOSPACE then
return "No available storage space."
else else
return "Error is invalid. Someone broke it." return "Error is invalid. Someone broke it."
end end
@ -113,6 +116,9 @@ end
-- "required_data" is a list of keys which must be in the config file's data -- "required_data" is a list of keys which must be in the config file's data
-- "defaults" is a map of keys and default values for them, which will be used if there is no matching key in the data -- "defaults" is a map of keys and default values for them, which will be used if there is no matching key in the data
local function load_config(required_data, defaults, filename) local function load_config(required_data, defaults, filename)
local required_data = required_data or {}
local defaults = defaults or {}
local filename = filename or "wyvern_config.tbl" local filename = filename or "wyvern_config.tbl"
local f = fs.open(filename, "r") local f = fs.open(filename, "r")
local data = textutils.unserialise(f.readAll()) local data = textutils.unserialise(f.readAll())
@ -144,4 +150,4 @@ local function init()
d.map(find_peripherals(function(type, name, wrapped) return type == "modem" end), rednet.open) d.map(find_peripherals(function(type, name, wrapped) return type == "modem" end), rednet.open)
end end
return { errors, serve, query_by_ID, query_by_type, load_config, find_peripherals, init } return { errors = errors, serve = serve, query_by_ID = query_by_ID, query_by_type = query_by_type, load_config = load_config, find_peripherals = find_peripherals, init = init }