Moved directory auto-creation to datamanager

diff --git a/prosody b/prosody
index 98d15da2a6c3783c5b6f3b31dd26e38eb7101308..a386324bb3989b2fd3f9f00736fc2220bd59fca7 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -108,30 +108,6 @@ require "util.jid"
 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
 require "util.datamanager".set_data_path(data_path);
 
-
-local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
-local _mkdir = {}
-function mkdir(path)
-       path = path:gsub("/", path_separator);
-       local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a");
-end
-function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
-function mkdirs(host)
-       if not _mkdir[host] then
-               local host_dir = string.format("%s/%s", data_path, encode(host));
-               mkdir(host_dir);
-               mkdir(host_dir.."/accounts");
-               mkdir(host_dir.."/vcard");
-               mkdir(host_dir.."/roster");
-               mkdir(host_dir.."/private");
-               mkdir(host_dir.."/offline");
-               _mkdir[host] = true;
-       end
-end
-mkdir(data_path);
-
-eventmanager.add_event_hook("host-activated", mkdirs);
-
 ----------- End of out-of-place code --------------
 
 eventmanager.fire_event("server-starting");

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index 858d78bb54e6d5687b6eea97d6a61ee64fceb2cd..2f837497c38114b1a7946534e5a8b9d5ea9bb9fc 100755 (executable)
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -27,40 +27,7 @@ local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";\r
 package.loaded["util.logger"] = {init = function() return function() end; end}\r
 local dm = require "util.datamanager"\r
-local data_path = "data";\r
-dm.set_data_path(data_path);\r
-\r
-local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end\r
-local _mkdir = {}\r
-function mkdir(path)\r
-       path = path:gsub("/", path_separator);\r
-       --print("mkdir",path);\r
-       local x = io.popen("mkdir "..path.." 2>&1"):read("*a");\r
-end\r
-function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end\r
-function getpath(username, host, datastore, ext)\r
-       ext = ext or "dat";\r
-       if username then\r
-               return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);\r
-       elseif host then\r
-               return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext);\r
-       else\r
-               return format("%s/%s.%s", data_path, datastore, ext);\r
-       end\r
-end\r
-function mkdirs(host)\r
-       if not _mkdir[host] then\r
-               local host_dir = string.format("%s/%s", data_path, encode(host));\r
-               mkdir(host_dir);\r
-               mkdir(host_dir.."/accounts");\r
-               mkdir(host_dir.."/vcard");\r
-               mkdir(host_dir.."/roster");\r
-               mkdir(host_dir.."/private");\r
-               mkdir(host_dir.."/offline");\r
-               _mkdir[host] = true;\r
-       end\r
-end\r
-mkdir(data_path);\r
+dm.set_data_path("data");\r
 \r
 function build_stanza(tuple, stanza)\r
        if tuple[1] == "xmlelement" then\r
@@ -83,31 +50,26 @@ function build_time(tuple)
 end\r
 \r
 function vcard(node, host, stanza)\r
-       mkdirs(host);\r
        local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza));\r
        print("["..(err or "success").."] vCard: "..node.."@"..host);\r
 end\r
 function password(node, host, password)\r
-       mkdirs(host);\r
        local ret, err = dm.store(node, host, "accounts", {password = password});\r
        print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);\r
 end\r
 function roster(node, host, jid, item)\r
-       mkdirs(host);\r
        local roster = dm.load(node, host, "roster") or {};\r
        roster[jid] = item;\r
        local ret, err = dm.store(node, host, "roster", roster);\r
        print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);\r
 end\r
 function private_storage(node, host, xmlns, stanza)\r
-       mkdirs(host);\r
        local private = dm.load(node, host, "private") or {};\r
        private[xmlns] = st.preserialize(stanza);\r
        local ret, err = dm.store(node, host, "private", private);\r
        print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);\r
 end\r
 function offline_msg(node, host, t, stanza)\r
-       mkdirs(host);\r
        stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t);\r
        stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t);\r
        local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));\r

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 45da17ddfe6913562cbc32b00d1513df2a93cbad..6a811879706facc934cad31834d2fa44d3e28146 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -26,11 +26,13 @@ local loadfile, setfenv, pcall = loadfile, setfenv, pcall;
 local log = require "util.logger".init("datamanager");
 local io_open = io.open;
 local os_remove = os.remove;
+local io_popen = io.popen;
 local tostring, tonumber = tostring, tonumber;
 local error = error;
 local next = next;
 local t_insert = table.insert;
 local append = require "util.serialization".append;
+local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end
 
 module "datamanager"
 
@@ -48,21 +50,37 @@ do
        end
 end
 
-------- API -------------
+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 data_path = "data";
+
+------- API -------------
+
 function set_data_path(path)
        log("info", "Setting data path to %s", path);
        data_path = path;
 end
 
-function getpath(username, host, datastore, ext)
+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("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);
+               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("%s/%s/%s.%s", data_path, encode(host), datastore, ext);
+               if create then mkdir(mkdir(data_path).."/"..host); end
+               return format("%s/%s/%s.%s", data_path, host, datastore, ext);
        else
+               if create then mkdir(data_path); end
                return format("%s/%s.%s", data_path, datastore, ext);
        end
 end
@@ -87,7 +105,7 @@ function store(username, host, datastore, data)
                data = {};
        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;
@@ -106,7 +124,7 @@ end
 function list_append(username, host, datastore, data)
        if not data then return; end
        -- save the datastore
-       local f, msg = io_open(getpath(username, host, datastore, "list"), "a+");
+       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;
@@ -123,7 +141,7 @@ function list_store(username, host, datastore, data)
                data = {};
        end
        -- save the datastore
-       local f, msg = io_open(getpath(username, host, datastore, "list"), "w+");
+       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;