util.xmppstream: new() now returns a parser object

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 54cf195932eba962e254d9016da76ea51311116f..a2da0aa344c50859001904beb43ce58f284e8ad1 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -15,19 +15,25 @@ 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
+local raw_mkdir;
+
+if prosody.platform == "posix" then
+       raw_mkdir = require "util.pposix".mkdir; -- Doesn't trample on umask
+else
+       raw_mkdir = require "lfs".mkdir;
+end
 
 module "datamanager"
 
 ---- utils -----
 local encode, decode;
-do 
+do
        local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
 
        decode = function (s)
@@ -43,7 +49,7 @@ 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");
+               raw_mkdir(path);
                _mkdir[path] = true;
        end
        return path;
@@ -62,7 +68,7 @@ end
 local function callback(username, host, datastore, data)
        for _, f in ipairs(callbacks) do
                username, host, datastore, data = f(username, host, datastore, data);
-               if not username then break; end
+               if username == false then break; end
        end
        
        return username, host, datastore, data;
@@ -88,7 +94,7 @@ end
 
 function getpath(username, host, datastore, ext, create)
        ext = ext or "dat";
-       host = host and encode(host);
+       host = (host and encode(host)) or "_global";
        username = username and encode(username);
        if username then
                if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end
@@ -123,7 +129,7 @@ function store(username, host, datastore, data)
        end
 
        username, host, datastore, data = callback(username, host, datastore, data);
-       if not username then
+       if username == false then
                return true; -- Don't save this data at all
        end
 
@@ -137,7 +143,7 @@ function store(username, host, datastore, data)
        append(f, data);
        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);
+               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
                os_remove(getpath(username, host, datastore));
        end
        -- we write data even when we are deleting because lua doesn't have a
@@ -147,7 +153,7 @@ end
 
 function list_append(username, host, datastore, data)
        if not data then return; end
-       if callback and callback(username, host, datastore) then return true; end
+       if callback(username, host, datastore) == false then return true; end
        -- save the datastore
        local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+");
        if not f then
@@ -165,7 +171,7 @@ function list_store(username, host, datastore, data)
        if not data then
                data = {};
        end
-       if callback and callback(username, host, datastore) then return true; end
+       if callback(username, host, datastore) == false then return true; end
        -- save the datastore
        local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+");
        if not f then
@@ -179,7 +185,7 @@ function list_store(username, host, datastore, data)
        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);
+               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
                os_remove(getpath(username, host, datastore, "list"));
        end
        -- we write data even when we are deleting because lua doesn't have a