Swiftdiff options
| -rw-r--r-- | Sluift/ElementConvertors/SConscript | 3 | ||||
| -rw-r--r-- | Sluift/ElementConvertors/SubjectConvertor.cpp | 35 | ||||
| -rw-r--r-- | Sluift/ElementConvertors/SubjectConvertor.h | 25 | ||||
| -rw-r--r-- | Sluift/LuaElementConvertors.cpp | 2 |
4 files changed, 64 insertions, 1 deletions
diff --git a/Sluift/ElementConvertors/SConscript b/Sluift/ElementConvertors/SConscript index 7317ac7..b9bfc22 100644 --- a/Sluift/ElementConvertors/SConscript +++ b/Sluift/ElementConvertors/SConscript @@ -1,52 +1,53 @@ Import('env') convertors = [ env.File("PubSubRetractConvertor.cpp"), env.File("PubSubAffiliationsConvertor.cpp"), env.File("PubSubPublishConvertor.cpp"), env.File("PubSubItemsConvertor.cpp"), env.File("PubSubOwnerRedirectConvertor.cpp"), env.File("PubSubEventRedirectConvertor.cpp"), env.File("UserTuneConvertor.cpp"), env.File("PubSubConfigureConvertor.cpp"), env.File("PubSubEventDisassociateConvertor.cpp"), env.File("PubSubOwnerAffiliationsConvertor.cpp"), env.File("PubSubOwnerConfigureConvertor.cpp"), env.File("UserLocationConvertor.cpp"), env.File("PubSubSubscribeOptionsConvertor.cpp"), env.File("PubSubOwnerSubscriptionsConvertor.cpp"), env.File("PubSubDefaultConvertor.cpp"), env.File("PubSubEventCollectionConvertor.cpp"), env.File("PubSubEventSubscriptionConvertor.cpp"), env.File("PubSubEventRetractConvertor.cpp"), env.File("PubSubItemConvertor.cpp"), env.File("PubSubUnsubscribeConvertor.cpp"), env.File("PubSubEventDeleteConvertor.cpp"), env.File("PubSubCreateConvertor.cpp"), env.File("PubSubOwnerPurgeConvertor.cpp"), env.File("PubSubEventItemsConvertor.cpp"), env.File("PubSubOptionsConvertor.cpp"), env.File("PubSubEventItemConvertor.cpp"), env.File("PubSubOwnerSubscriptionConvertor.cpp"), env.File("PubSubOwnerAffiliationConvertor.cpp"), env.File("PubSubEventPurgeConvertor.cpp"), env.File("PubSubAffiliationConvertor.cpp"), env.File("PubSubSubscribeConvertor.cpp"), env.File("PubSubOwnerDeleteConvertor.cpp"), env.File("PubSubOwnerDefaultConvertor.cpp"), env.File("PubSubSubscriptionsConvertor.cpp"), env.File("PubSubEventAssociateConvertor.cpp"), env.File("PubSubSubscriptionConvertor.cpp"), env.File("SecurityLabelConvertor.cpp"), env.File("PubSubEventConfigurationConvertor.cpp"), env.File("IQConvertor.cpp"), env.File("PresenceConvertor.cpp"), env.File("MessageConvertor.cpp"), env.File("ResultSetConvertor.cpp"), env.File("ForwardedConvertor.cpp"), env.File("MAMResultConvertor.cpp"), env.File("MAMQueryConvertor.cpp"), - env.File("MAMArchivedConvertor.cpp") + env.File("MAMArchivedConvertor.cpp"), + env.File("SubjectConvertor.cpp") ] Return('convertors') diff --git a/Sluift/ElementConvertors/SubjectConvertor.cpp b/Sluift/ElementConvertors/SubjectConvertor.cpp new file mode 100644 index 0000000..29e2c4f --- /dev/null +++ b/Sluift/ElementConvertors/SubjectConvertor.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License. + * See the COPYING file for more information. + */ + +#include <Sluift/ElementConvertors/SubjectConvertor.h> + +#include <lua.hpp> +#include <boost/smart_ptr/make_shared.hpp> +#include <Sluift/Lua/LuaUtils.h> + +using namespace Swift; + +SubjectConvertor::SubjectConvertor() : GenericLuaElementConvertor<Subject>("subject") { +} + +SubjectConvertor::~SubjectConvertor() { +} + +boost::shared_ptr<Subject> SubjectConvertor::doConvertFromLua(lua_State* L) { + boost::shared_ptr<Subject> result = boost::make_shared<Subject>(); + if (boost::optional<std::string> value = Lua::getStringField(L, -1, "text")) { + result->setText(*value); + } + return result; +} + +void SubjectConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<Subject> payload) { + lua_createtable(L, 0, 0); + if (!payload->getText().empty()) { + lua_pushstring(L, payload->getText().c_str()); + lua_setfield(L, -2, "text"); + } +} diff --git a/Sluift/ElementConvertors/SubjectConvertor.h b/Sluift/ElementConvertors/SubjectConvertor.h new file mode 100644 index 0000000..4b3716e --- /dev/null +++ b/Sluift/ElementConvertors/SubjectConvertor.h @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License. + * See the COPYING file for more information. + */ + +#pragma once + +#include <Swiften/Base/Override.h> + +#include <Sluift/GenericLuaElementConvertor.h> +#include <Swiften/Elements/Subject.h> + +namespace Swift { + class LuaElementConvertors; + + class SubjectConvertor : public GenericLuaElementConvertor<Subject> { + public: + SubjectConvertor(); + virtual ~SubjectConvertor(); + + virtual boost::shared_ptr<Subject> doConvertFromLua(lua_State*) SWIFTEN_OVERRIDE; + virtual void doConvertToLua(lua_State*, boost::shared_ptr<Subject>) SWIFTEN_OVERRIDE; + }; +} diff --git a/Sluift/LuaElementConvertors.cpp b/Sluift/LuaElementConvertors.cpp index 9ca932e..253a820 100644 --- a/Sluift/LuaElementConvertors.cpp +++ b/Sluift/LuaElementConvertors.cpp @@ -1,134 +1,136 @@ /* * Copyright (c) 2013-2014 Remko Tronçon * Licensed under the GNU General Public License. * See the COPYING file for more information. */ #include <Sluift/LuaElementConvertors.h> #include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Base/foreach.h> #include <Sluift/LuaElementConvertor.h> #include <Sluift/ElementConvertors/RawXMLElementConvertor.h> #include <Sluift/ElementConvertors/PubSubEventConvertor.h> #include <Sluift/ElementConvertors/DOMElementConvertor.h> #include <Sluift/ElementConvertors/DefaultElementConvertor.h> #include <Sluift/ElementConvertors/DiscoItemsConvertor.h> #include <Sluift/ElementConvertors/DiscoInfoConvertor.h> #include <Sluift/ElementConvertors/FormConvertor.h> #include <Sluift/ElementConvertors/SoftwareVersionConvertor.h> #include <Sluift/ElementConvertors/VCardUpdateConvertor.h> #include <Sluift/ElementConvertors/VCardConvertor.h> #include <Sluift/ElementConvertors/BodyConvertor.h> +#include <Sluift/ElementConvertors/SubjectConvertor.h> #include <Sluift/ElementConvertors/CommandConvertor.h> #include <Sluift/ElementConvertors/StatusShowConvertor.h> #include <Sluift/ElementConvertors/StatusConvertor.h> #include <Sluift/ElementConvertors/DelayConvertor.h> #include <Sluift/ElementConvertors/IQConvertor.h> #include <Sluift/ElementConvertors/PresenceConvertor.h> #include <Sluift/ElementConvertors/MessageConvertor.h> #include <Sluift/ElementConvertors/ResultSetConvertor.h> #include <Sluift/ElementConvertors/ForwardedConvertor.h> #include <Sluift/ElementConvertors/MAMResultConvertor.h> #include <Sluift/ElementConvertors/MAMQueryConvertor.h> #include <Sluift/ElementConvertors/MAMArchivedConvertor.h> #include <Sluift/Lua/LuaUtils.h> #include <Sluift/Lua/Exception.h> using namespace Swift; LuaElementConvertors::LuaElementConvertors() { registerConvertors(); convertors.push_back(boost::make_shared<StatusConvertor>()); convertors.push_back(boost::make_shared<StatusShowConvertor>()); convertors.push_back(boost::make_shared<DelayConvertor>()); convertors.push_back(boost::make_shared<CommandConvertor>(this)); convertors.push_back(boost::make_shared<PubSubEventConvertor>(this)); convertors.push_back(boost::make_shared<BodyConvertor>()); + convertors.push_back(boost::make_shared<SubjectConvertor>()); convertors.push_back(boost::make_shared<VCardConvertor>()); convertors.push_back(boost::make_shared<VCardUpdateConvertor>()); convertors.push_back(boost::make_shared<FormConvertor>()); convertors.push_back(boost::make_shared<SoftwareVersionConvertor>()); convertors.push_back(boost::make_shared<DiscoInfoConvertor>()); convertors.push_back(boost::make_shared<DiscoItemsConvertor>()); convertors.push_back(boost::make_shared<IQConvertor>(this)); convertors.push_back(boost::make_shared<PresenceConvertor>(this)); convertors.push_back(boost::make_shared<MessageConvertor>(this)); convertors.push_back(boost::make_shared<ResultSetConvertor>(this)); convertors.push_back(boost::make_shared<ForwardedConvertor>(this)); convertors.push_back(boost::make_shared<MAMResultConvertor>(this)); convertors.push_back(boost::make_shared<MAMQueryConvertor>(this)); convertors.push_back(boost::make_shared<MAMArchivedConvertor>(this)); convertors.push_back(boost::make_shared<DOMElementConvertor>()); convertors.push_back(boost::make_shared<RawXMLElementConvertor>()); convertors.push_back(boost::make_shared<DefaultElementConvertor>()); } LuaElementConvertors::~LuaElementConvertors() { } #include <Sluift/ElementConvertors/ElementConvertors.ipp> boost::shared_ptr<Element> LuaElementConvertors::convertFromLua(lua_State* L, int index) { if (lua_isstring(L, index)) { return convertFromLuaUntyped(L, index, "xml"); } else if (lua_istable(L, index)) { lua_getfield(L, index, "_type"); if (lua_isstring(L, -1)) { std::string type = lua_tostring(L, -1); lua_pop(L, 1); return convertFromLuaUntyped(L, index, type); } lua_pop(L, 1); } throw Lua::Exception("Unable to determine type"); } boost::shared_ptr<Element> LuaElementConvertors::convertFromLuaUntyped(lua_State* L, int index, const std::string& type) { index = Lua::absoluteOffset(L, index); foreach (boost::shared_ptr<LuaElementConvertor> convertor, convertors) { if (boost::shared_ptr<Element> result = convertor->convertFromLua(L, index, type)) { return result; } } return boost::shared_ptr<Element>(); } int LuaElementConvertors::convertToLua(lua_State* L, boost::shared_ptr<Element> payload) { if (boost::optional<std::string> type = doConvertToLuaUntyped(L, payload)) { if (lua_istable(L, -1)) { lua_pushstring(L, type->c_str()); lua_setfield(L, -2, "_type"); Lua::registerTableToString(L, -1); } else { assert(*type == "xml"); } return 1; } return 0; } int LuaElementConvertors::convertToLuaUntyped(lua_State* L, boost::shared_ptr<Element> payload) { if (doConvertToLuaUntyped(L, payload)) { return 1; } return 0; } boost::optional<std::string> LuaElementConvertors::doConvertToLuaUntyped( lua_State* L, boost::shared_ptr<Element> payload) { if (!payload) { return LuaElementConvertor::NO_RESULT; } foreach (boost::shared_ptr<LuaElementConvertor> convertor, convertors) { if (boost::optional<std::string> type = convertor->convertToLua(L, payload)) { return *type; } } return LuaElementConvertor::NO_RESULT; } |