X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fejabberd2prosody.lua;h=2f837497c38114b1a7946534e5a8b9d5ea9bb9fc;hb=329548a9db2cbe5db614e59066ba1105ddf92ebf;hp=33f60c99bfad0ffeebf8a68972d4e4a3dd318918;hpb=10904eb0553bd5e6efadbd8ab04ed77c49aa03b9;p=prosody.git

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index 33f60c99..2f837497 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env lua
--- Prosody IM v0.1
+-- Prosody IM v0.2
 -- Copyright (C) 2008 Matthew Wild
 -- Copyright (C) 2008 Waqas Hussain
 -- 
@@ -21,46 +21,13 @@
 
 
 require "erlparse";
-require "serialize";
 
 package.path = package.path ..";../?.lua";
+local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";
 package.loaded["util.logger"] = {init = function() return function() end; end}
 local dm = require "util.datamanager"
-local data_path = "data";
-dm.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);
-	--print("mkdir",path);
-	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("%%%x", c:byte()); end)); end
-function getpath(username, host, datastore, ext)
-	ext = ext or "dat";
-	if username then
-		return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext);
-	elseif host then
-		return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext);
-	else
-		return format("%s/%s.%s", data_path, datastore, ext);
-	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);
+dm.set_data_path("data");
 
 function build_stanza(tuple, stanza)
 	if tuple[1] == "xmlelement" then
@@ -74,7 +41,7 @@ function build_stanza(tuple, stanza)
 	elseif tuple[1] == "xmlcdata" then
 		stanza:text(tuple[2]);
 	else
-		error("unknown element type: "..serialize.serialize(tuple));
+		error("unknown element type: "..serialize(tuple));
 	end
 end
 function build_time(tuple)
@@ -83,31 +50,26 @@ function build_time(tuple)
 end
 
 function vcard(node, host, stanza)
-	mkdirs(host);
 	local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza));
 	print("["..(err or "success").."] vCard: "..node.."@"..host);
 end
 function password(node, host, password)
-	mkdirs(host);
 	local ret, err = dm.store(node, host, "accounts", {password = password});
 	print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);
 end
 function roster(node, host, jid, item)
-	mkdirs(host);
 	local roster = dm.load(node, host, "roster") or {};
 	roster[jid] = item;
 	local ret, err = dm.store(node, host, "roster", roster);
 	print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);
 end
 function private_storage(node, host, xmlns, stanza)
-	mkdirs(host);
 	local private = dm.load(node, host, "private") or {};
 	private[xmlns] = st.preserialize(stanza);
 	local ret, err = dm.store(node, host, "private", private);
 	print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);
 end
 function offline_msg(node, host, t, stanza)
-	mkdirs(host);
 	stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t);
 	stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t);
 	local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));
@@ -124,7 +86,7 @@ local filters = {
 	end;
 	roster = function(tuple)
 		local node = tuple[3][1]; local host = tuple[3][2];
-		local contact = tuple[4][1].."@"..tuple[4][2];
+		local contact = (type(tuple[4][1]) == "table") and tuple[4][2] or tuple[4][1].."@"..tuple[4][2];
 		local name = tuple[5]; local subscription = tuple[6];
 		local ask = tuple[7]; local groups = tuple[8];
 		if type(name) ~= type("") then name = nil; end
@@ -190,7 +152,7 @@ for item in erlparse.parseFile(arg) do
 	count = count + 1;
 	local name = item[1];
 	t[name] = (t[name] or 0) + 1;
-	--print(count, serialize.serialize(item));
+	--print(count, serialize(item));
 	if filters[name] then filters[name](item); end
 end
---print(serialize.serialize(t));
+--print(serialize(t));