X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatamanager.lua;h=614f0c80c5b33d7d4c3e14c3d2fcc45b34d31f5c;hb=e116081c1d261e25c546a1a98c4207fd5e3fc48e;hp=aad370d1e8ae372864b20731e68988df519be973;hpb=6576a5d962151d8fdaf67acb5f3c740a4d03198a;p=prosody.git diff --git a/util/datamanager.lua b/util/datamanager.lua index aad370d1..614f0c80 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -1,29 +1,32 @@ +-- Prosody IM v0.4 +-- Copyright (C) 2008-2009 Matthew Wild +-- Copyright (C) 2008-2009 Waqas Hussain +-- +-- This project is MIT/X11 licensed. Please see the +-- COPYING file in the source package for more information. +-- + + local format = string.format; local setmetatable, type = setmetatable, type; -local pairs = pairs; +local pairs, ipairs = pairs, ipairs; local char = string.char; local loadfile, setfenv, pcall = loadfile, setfenv, pcall; -local log = log; +local log = require "util.logger".init("datamanager"); local io_open = io.open; local os_remove = os.remove; -local tostring = tostring; +local io_popen = io.popen; +local tostring, tonumber = tostring, tonumber; local error = error; local next = next; - -local indent = function(f, i) - for n = 1, i do - f:write("\t"); - end -end +local t_insert = table.insert; +local append = require "util.serialization".append; +local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end module "datamanager" - ---- utils ----- local encode, decode; - -local log = function (type, msg) return log(type, "datamanager", msg); end - do local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end }); @@ -32,57 +35,53 @@ do end encode = function (s) - return s and (s:gsub("%W", function (c) return format("%%%x", c:byte()); end)); + return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end end -local function basicSerialize (o) - if type(o) == "number" or type(o) == "boolean" then - return tostring(o); - else -- assume it is a string -- FIXME make sure it's a string. throw an error otherwise. - return (format("%q", tostring(o)):gsub("\\\n", "\\n")); +local _mkdir = {}; +local function mkdir(path) + path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here + if not _mkdir[path] then + local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a"); + _mkdir[path] = true; end + return path; end - -local function simplesave (f, o, ind) - if type(o) == "number" then - f:write(o) - elseif type(o) == "string" then - f:write((format("%q", o):gsub("\\\n", "\\n"))) - elseif type(o) == "table" then - f:write("{\n") - for k,v in pairs(o) do - indent(f, ind); - f:write("[", basicSerialize(k), "] = ") - simplesave(f, v, ind+1) - f:write(",\n") - end - indent(f, ind-1); - f:write("}") - elseif type(o) == "boolean" then - f:write(o and "true" or "false"); - else - error("cannot serialize a " .. type(o)) - end -end +local data_path = "data"; +local callback; ------- API ------------- -function getpath(username, host, datastore) +function set_data_path(path) + log("info", "Setting data path to: %s", path); + data_path = path; +end +function set_callback(func) + callback = func; +end + +function getpath(username, host, datastore, ext, create) + ext = ext or "dat"; + host = host and encode(host); + username = username and encode(username); if username then - return format("data/%s/%s/%s.dat", encode(host), datastore, encode(username)); + if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end + return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext); elseif host then - return format("data/%s/%s.dat", encode(host), datastore); + if create then mkdir(mkdir(data_path).."/"..host); end + return format("%s/%s/%s.%s", data_path, host, datastore, ext); else - return format("data/%s.dat", datastore); + if create then mkdir(data_path); end + return format("%s/%s.%s", data_path, datastore, ext); end end function load(username, host, datastore) local data, ret = loadfile(getpath(username, host, datastore)); if not data then - log("warn", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); return nil; end setfenv(data, {}); @@ -98,16 +97,18 @@ function store(username, host, datastore, data) if not data then data = {}; end + if callback and callback(username, host, datastore) then return true; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore), "w+"); + local f, msg = io_open(getpath(username, host, datastore, nil, true), "w+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return; end f:write("return "); - simplesave(f, data, 1); + append(f, data); f:close(); - if not next(data) then -- try to delete empty datastore + if next(data) == nil then -- try to delete empty datastore + log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host); os_remove(getpath(username, host, datastore)); end -- we write data even when we are deleting because lua doesn't have a @@ -115,4 +116,62 @@ function store(username, host, datastore, data) return true; end -return _M; \ No newline at end of file +function list_append(username, host, datastore, data) + if not data then return; end + if callback and callback(username, host, datastore) then return true; end + -- save the datastore + local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+"); + if not f then + log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); + return; + end + f:write("item("); + append(f, data); + f:write(");\n"); + f:close(); + return true; +end + +function list_store(username, host, datastore, data) + if not data then + data = {}; + end + if callback and callback(username, host, datastore) then return true; end + -- save the datastore + local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+"); + if not f then + log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); + return; + end + for _, d in ipairs(data) do + f:write("item("); + append(f, d); + f:write(");\n"); + end + f:close(); + if next(data) == nil then -- try to delete empty datastore + log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host); + os_remove(getpath(username, host, datastore, "list")); + end + -- we write data even when we are deleting because lua doesn't have a + -- platform independent way of checking for non-exisitng files + return true; +end + +function list_load(username, host, datastore) + local data, ret = loadfile(getpath(username, host, datastore, "list")); + if not data then + log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + return nil; + end + local items = {}; + setfenv(data, {item = function(i) t_insert(items, i); end}); + local success, ret = pcall(data); + if not success then + log("error", "Unable to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil")); + return nil; + end + return items; +end + +return _M;