aboutsummaryrefslogtreecommitdiffstats
path: root/util/stanza.lua
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2008-11-15 13:47:17 +0100
committerTobias Markmann <tm@ayena.de>2008-11-15 13:47:17 +0100
commitefb34b5c4af68c37a568e61986a0b93535a50814 (patch)
treeba77cb7ad14158323a31bfb9e332c508e94d5b31 /util/stanza.lua
parent18e785078a2edf69bf4ec728290a18de2ed28cd7 (diff)
parentaefcb845c34c7bf15a370812b28b5da27fbc983b (diff)
downloadprosody-efb34b5c4af68c37a568e61986a0b93535a50814.tar.gz
prosody-efb34b5c4af68c37a568e61986a0b93535a50814.zip
Merging my new SASL code with Waqas' adjusted saslauth module.
Diffstat (limited to 'util/stanza.lua')
-rw-r--r--util/stanza.lua53
1 files changed, 52 insertions, 1 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index 52f372cc..5a6ba8c5 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -10,8 +10,11 @@ local next = next;
local print = print;
local unpack = unpack;
local s_gsub = string.gsub;
+local os = os;
+
+local do_pretty_printing = not os.getenv("WINDIR");
+local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
-local debug = debug;
local log = require "util.logger".init("stanza");
module "stanza"
@@ -105,6 +108,14 @@ function stanza_mt.__tostring(t)
return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
end
+function stanza_mt.top_tag(t)
+ local attr_string = "";
+ if t.attr then
+ for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
+ end
+ return s_format("<%s%s>", t.name, attr_string);
+end
+
function stanza_mt.__add(s1, s2)
return s1:add_direct_child(s2);
end
@@ -184,4 +195,44 @@ function presence(attr)
return stanza("presence", attr);
end
+if do_pretty_printing then
+ local style_attrk = getstyle("yellow");
+ local style_attrv = getstyle("red");
+ local style_tagname = getstyle("red");
+ local style_punc = getstyle("magenta");
+
+ local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
+ local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
+ --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
+ local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
+ function stanza_mt.pretty_print(t)
+ local children_text = "";
+ for n, child in ipairs(t) do
+ if type(child) == "string" then
+ children_text = children_text .. xml_escape(child);
+ else
+ children_text = children_text .. child:pretty_print();
+ end
+ end
+
+ local attr_string = "";
+ if t.attr then
+ for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
+ end
+ return s_format(tag_format, t.name, attr_string, children_text, t.name);
+ end
+
+ function stanza_mt.pretty_top_tag(t)
+ local attr_string = "";
+ if t.attr then
+ for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
+ end
+ return s_format(top_tag_format, t.name, attr_string);
+ end
+else
+ -- Sorry, fresh out of colours for you guys ;)
+ stanza_mt.pretty_print = stanza_mt.__tostring;
+ stanza_mt.pretty_top_tag = stanza_mt.top_tag;
+end
+
return _M;