8 files changed, 164 insertions, 1 deletions
diff --git a/Swiften/AdHoc/OutgoingAdHocCommandSession.cpp b/Swiften/AdHoc/OutgoingAdHocCommandSession.cpp
new file mode 100644
index 0000000..40b17e7
--- /dev/null
+++ b/Swiften/AdHoc/OutgoingAdHocCommandSession.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2010-2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
+
+#include <boost/bind.hpp>
+
+#include <Swiften/Queries/GenericRequest.h>
+
+namespace Swift {
+OutgoingAdHocCommandSession::OutgoingAdHocCommandSession(const DiscoItems::Item& command, AdHocCommandWindowFactory* /*factory*/, IQRouter* iqRouter) : command_(command), iqRouter_(iqRouter), isMultiStage_(false) {
+
+}
+
+void OutgoingAdHocCommandSession::handleResponse(boost::shared_ptr<Command> payload, ErrorPayload::ref error) {
+	if (error) {
+		onError(error);
+	} else {
+		sessionID_ = payload->getSessionID();
+		const std::vector<Command::Action> actions = payload->getAvailableActions();
+		if (std::find(actions.begin(), actions.end(), Command::Next) != actions.end()
+				|| std::find(actions.begin(), actions.end(), Command::Prev) != actions.end()) {
+			isMultiStage_ = true;
+		}
+		onNextStageReceived(payload);
+	}
+}
+
+bool OutgoingAdHocCommandSession::getIsMultiStage() {
+	return isMultiStage_;
+}
+
+void OutgoingAdHocCommandSession::start() {
+	boost::shared_ptr<Payload> commandPayload(new Command(command_.getNode()));
+	boost::shared_ptr<GenericRequest<Command> > commandRequest(new GenericRequest<Command>(IQ::Set, command_.getJID(), commandPayload, iqRouter_));
+	commandRequest->onResponse.connect(boost::bind(&OutgoingAdHocCommandSession::handleResponse, this, _1, _2));
+	commandRequest->send();
+}
+
+void OutgoingAdHocCommandSession::cancel() {
+	if (!sessionID_.empty()) {
+		boost::shared_ptr<Payload> commandPayload(new Command(command_.getNode(), sessionID_, Command::Cancel));
+		boost::shared_ptr<GenericRequest<Command> > commandRequest(new GenericRequest<Command>(IQ::Set, command_.getJID(), commandPayload, iqRouter_));
+		commandRequest->onResponse.connect(boost::bind(&OutgoingAdHocCommandSession::handleResponse, this, _1, _2));
+		commandRequest->send();
+	}
+}
+
+void OutgoingAdHocCommandSession::goBack() {
+	boost::shared_ptr<Payload> commandPayload(new Command(command_.getNode(), sessionID_, Command::Prev));
+	boost::shared_ptr<GenericRequest<Command> > commandRequest(new GenericRequest<Command>(IQ::Set, command_.getJID(), commandPayload, iqRouter_));
+	commandRequest->onResponse.connect(boost::bind(&OutgoingAdHocCommandSession::handleResponse, this, _1, _2));
+	commandRequest->send();
+}
+
+void OutgoingAdHocCommandSession::complete(Form::ref form) {
+	Command* command = new Command(command_.getNode(), sessionID_, Command::Complete);
+	boost::shared_ptr<Payload> commandPayload(command);
+	command->setForm(form);
+	boost::shared_ptr<GenericRequest<Command> > commandRequest(new GenericRequest<Command>(IQ::Set, command_.getJID(), commandPayload, iqRouter_));
+	commandRequest->onResponse.connect(boost::bind(&OutgoingAdHocCommandSession::handleResponse, this, _1, _2));
+	commandRequest->send();
+}
+
+void OutgoingAdHocCommandSession::goNext(Form::ref form) {
+	Command* command = new Command(command_.getNode(), sessionID_, Command::Next);
+	boost::shared_ptr<Payload> commandPayload(command);
+	command->setForm(form);
+	boost::shared_ptr<GenericRequest<Command> > commandRequest(new GenericRequest<Command>(IQ::Set, command_.getJID(), commandPayload, iqRouter_));
+	commandRequest->onResponse.connect(boost::bind(&OutgoingAdHocCommandSession::handleResponse, this, _1, _2));
+	commandRequest->send();
+}
+
+}
diff --git a/Swiften/AdHoc/OutgoingAdHocCommandSession.h b/Swiften/AdHoc/OutgoingAdHocCommandSession.h
new file mode 100644
index 0000000..820dc62
--- /dev/null
+++ b/Swiften/AdHoc/OutgoingAdHocCommandSession.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2010-2011 Kevin Smith
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <Swiften/Base/boost_bsignals.h>
+#include <boost/shared_ptr.hpp>
+#include <Swiften/Elements/DiscoItems.h>
+#include <Swiften/Elements/Command.h>
+#include <Swiften/Elements/ErrorPayload.h>
+
+namespace Swift {
+	class IQRouter;
+	class MainWindow;
+	class UIEventStream;
+	class AdHocCommandWindowFactory;
+	class OutgoingAdHocCommandSession {
+		public:
+			OutgoingAdHocCommandSession(const DiscoItems::Item& command, AdHocCommandWindowFactory* factory, IQRouter* iqRouter);
+			/**
+			 * Send initial request to the target.
+			 */
+			void start();
+			/**
+			 * Cancel command session with the target.
+			 */
+			void cancel();
+			/**
+			 * Return to the previous stage.
+			 */
+			void goBack();
+			/**
+			 * Send the form to complete the command.
+			 * \param form Form for submission - if missing the command will be submitted with no form.
+			 */
+			void complete(Form::ref form);
+			/**
+			 * Send the form to advance to the next stage of the command.
+			 * \param form Form for submission - if missing the command will be submitted with no form.
+			 */
+			void goNext(Form::ref form);
+
+			/**
+			 * Is the form multi-stage?
+			 */
+			bool getIsMultiStage();
+
+			/**
+			 * Emitted when the form for the next stage is available.
+			 */
+			boost::signal<void (Command::ref)> onNextStageReceived;
+
+			/**
+			 * Emitted on error.
+			 */
+			boost::signal<void (ErrorPayload::ref)> onError;
+		private:
+			void handleResponse(boost::shared_ptr<Command> payload, ErrorPayload::ref error);
+		private:
+			DiscoItems::Item command_;
+			IQRouter* iqRouter_;
+			bool isMultiStage_;
+			std::string sessionID_;
+	};
+}
diff --git a/Swiften/AdHoc/SConscript b/Swiften/AdHoc/SConscript
new file mode 100644
index 0000000..69c9083
--- /dev/null
+++ b/Swiften/AdHoc/SConscript
@@ -0,0 +1,6 @@
+Import("swiften_env")
+
+objects = swiften_env.SwiftenObject([
+			"OutgoingAdHocCommandSession.cpp",
+		])
+swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Disco/GetDiscoItemsRequest.h b/Swiften/Disco/GetDiscoItemsRequest.h
index 0a94402..46735ef 100644
--- a/Swiften/Disco/GetDiscoItemsRequest.h
+++ b/Swiften/Disco/GetDiscoItemsRequest.h
@@ -18,9 +18,18 @@ namespace Swift {
 				return ref(new GetDiscoItemsRequest(jid, router));
 			}
 
+			static ref create(const JID& jid, const std::string& node, IQRouter* router) {
+				return ref(new GetDiscoItemsRequest(jid, node, router));
+			}
+
 		private:
 			GetDiscoItemsRequest(const JID& jid, IQRouter* router) :
 					GenericRequest<DiscoItems>(IQ::Get, jid, boost::shared_ptr<DiscoItems>(new DiscoItems()), router) {
 			}
+
+			GetDiscoItemsRequest(const JID& jid, const std::string& node, IQRouter* router) :
+				GenericRequest<DiscoItems>(IQ::Get, jid, boost::shared_ptr<DiscoItems>(new DiscoItems()), router) {
+				getPayloadGeneric()->setNode(node);
+			}
 	};
 }
diff --git a/Swiften/Elements/DiscoInfo.cpp b/Swiften/Elements/DiscoInfo.cpp
index 158ea66..5b2bb04 100644
--- a/Swiften/Elements/DiscoInfo.cpp
+++ b/Swiften/Elements/DiscoInfo.cpp
@@ -14,6 +14,7 @@ const std::string DiscoInfo::ChatStatesFeature = std::string("http://jabber.org/
 const std::string DiscoInfo::SecurityLabelsFeature = std::string("urn:xmpp:sec-label:0");
 const std::string DiscoInfo::SecurityLabelsCatalogFeature = std::string("urn:xmpp:sec-label:catalog:2");
 const std::string DiscoInfo::JabberSearchFeature = std::string("jabber:iq:search");
+const std::string DiscoInfo::CommandsFeature = std::string("http://jabber.org/protocol/commands");
 
 
 bool DiscoInfo::Identity::operator<(const Identity& other) const {
diff --git a/Swiften/Elements/DiscoInfo.h b/Swiften/Elements/DiscoInfo.h
index 6144b16..cd650b9 100644
--- a/Swiften/Elements/DiscoInfo.h
+++ b/Swiften/Elements/DiscoInfo.h
@@ -21,6 +21,7 @@ namespace Swift {
 			static const std::string SecurityLabelsFeature;
 			static const std::string SecurityLabelsCatalogFeature;
 			static const std::string JabberSearchFeature;
+			static const std::string CommandsFeature;
 
 			class Identity {
 				public:
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 7c1f70f..5536b3f 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -190,6 +190,7 @@ if env["SCONS_STAGE"] == "build" :
 			"StreamManagement",
 			"Component",
 			"Config",
+			"AdHoc"
 		])
 	SConscript(test_only = True, dirs = [
 			"QA",
diff --git a/Swiften/Serializer/PayloadSerializers/CommandSerializer.cpp b/Swiften/Serializer/PayloadSerializers/CommandSerializer.cpp
index 0fa45ce..12a38a8 100644
--- a/Swiften/Serializer/PayloadSerializers/CommandSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/CommandSerializer.cpp
@@ -21,7 +21,7 @@ CommandSerializer::CommandSerializer() {
 }
 
 std::string CommandSerializer::serializePayload(boost::shared_ptr<Command> command)	const {
-	XMLElement commandElement("command", "http://jabber.org/protocol/comands");
+	XMLElement commandElement("command", "http://jabber.org/protocol/commands");
 	commandElement.setAttribute("node", command->getNode());
 
 	if (!command->getSessionID().empty()) {