Fixed URL encoding to generate %0x instead of %x

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index f25fffb36effbfed38215f8c4afc6b6f67aa2162..45da17ddfe6913562cbc32b00d1513df2a93cbad 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,32 +1,41 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 local format = string.format;
 local setmetatable, type = setmetatable, type;
 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, tonumber = tostring, tonumber;
 local error = error;
 local next = next;
 local t_insert = table.insert;
-
-local indent = function(f, i)
-       for n = 1, i do
-               f:write("\t");
-       end
-end
-
-local data_path = "data";
+local append = require "util.serialization".append;
 
 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 });
 
@@ -35,44 +44,15 @@ do
        end
 
        encode = function (s)
-               return s and (s:gsub("%W", function (c) return format("%%%x", 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"));
-       end
-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))
+               return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end));
        end
 end
 
 ------- API -------------
 
+local data_path = "data";
 function set_data_path(path)
+       log("info", "Setting data path to %s", path);
        data_path = path;
 end
 
@@ -113,7 +93,7 @@ function store(username, host, datastore, data)
                return;
        end
        f:write("return ");
-       simplesave(f, data, 1);
+       append(f, data);
        f:close();
        if not next(data) then -- try to delete empty datastore
                os_remove(getpath(username, host, datastore));
@@ -132,7 +112,7 @@ function list_append(username, host, datastore, data)
                return;
        end
        f:write("item(");
-       simplesave(f, data, 1);
+       append(f, data);
        f:write(");\n");
        f:close();
        return true;
@@ -150,7 +130,7 @@ function list_store(username, host, datastore, data)
        end
        for _, d in ipairs(data) do
                f:write("item(");
-               simplesave(f, d, 1);
+               append(f, d);
                f:write(");\n");
        end
        f:close();