8 files changed, 233 insertions, 5 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index c53bcaf..e95e704 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -26,6 +26,9 @@
 #include <Swiften/TLS/BlindCertificateTrustChecker.h>
 #include <Swiften/Client/NickManagerImpl.h>
 #include <Swiften/Client/ClientSession.h>
+#include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/Network/NetworkFactories.h>
+#include <Swiften/FileTransfer/FileTransferManagerImpl.h>
 
 namespace Swift {
 
@@ -59,9 +62,15 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 	nickResolver = new NickResolver(jid.toBare(), roster, vcardManager, mucRegistry);
 
 	blindCertificateTrustChecker = new BlindCertificateTrustChecker();
+	
+	jingleSessionManager = new JingleSessionManager(getIQRouter());
+	fileTransferManager = NULL;
 }
 
 Client::~Client() {
+	delete fileTransferManager;
+	delete jingleSessionManager;
+	
 	delete blindCertificateTrustChecker;
 
 	delete nickResolver;
@@ -98,6 +107,10 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
 	softwareVersionResponder->setVersion(name, version, os);
 }
 
+void Client::handleConnected() {
+	fileTransferManager = new FileTransferManagerImpl(getJID(), jingleSessionManager, getIQRouter(), getEntityCapsProvider(), presenceOracle, getNetworkFactories()->getConnectionFactory(), getNetworkFactories()->getConnectionServerFactory(), getNetworkFactories()->getTimerFactory(), getNetworkFactories()->getPlatformNATTraversalWorker());
+}
+
 void Client::requestRoster() {
 	// FIXME: We should set this once when the session is finished, but there
 	// is currently no callback for this
@@ -139,4 +152,8 @@ NickManager* Client::getNickManager() const {
 	return nickManager;
 }
 
+FileTransferManager* Client::getFileTransferManager() const {
+	return fileTransferManager;
+}
+
 }
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index 08289a5..7269f10 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -33,6 +33,9 @@ namespace Swift {
 	class SubscriptionManager;
 	class ClientDiscoManager;
 	class NickManager;
+	class FileTransferManager;
+	class JingleSessionManager;
+	class FileTransferManagerImpl;
 
 	/**
 	 * Provides the core functionality for writing XMPP client software.
@@ -131,6 +134,11 @@ namespace Swift {
 			ClientDiscoManager* getDiscoManager() const {
 				return discoManager;
 			}
+			
+			/**
+			 * Returns a FileTransferManager for the client. This is only available after the onConnected signal has been fired.
+			 */
+			FileTransferManager* getFileTransferManager() const;
 
 			/**
 			 * Configures the client to always trust a non-validating
@@ -149,6 +157,9 @@ namespace Swift {
 		private:
 			Storages* getStorages() const;
 
+		protected:
+			void handleConnected();
+
 		private:
 			Storages* storages;
 			MemoryStorages* memoryStorages;
@@ -168,6 +179,8 @@ namespace Swift {
 			SubscriptionManager* subscriptionManager;
 			MUCManager* mucManager;
 			ClientDiscoManager* discoManager;
+			JingleSessionManager* jingleSessionManager;
+			FileTransferManagerImpl* fileTransferManager;
 			BlindCertificateTrustChecker* blindCertificateTrustChecker;
 	};
 }
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
index c1e398d..c1093eb 100644
--- a/Swiften/Client/ClientXMLTracer.cpp
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -12,13 +12,18 @@
 namespace Swift {
 
 ClientXMLTracer::ClientXMLTracer(CoreClient* client) {
-	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, '<', _1));
-	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, '>', _1));
+	beautifier = new XMLBeautifier(true, true);
+	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1));
+	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1));
+}
+
+ClientXMLTracer::~ClientXMLTracer() {
+	delete beautifier;
 }
 
 void ClientXMLTracer::printData(char direction, const SafeByteArray& data) {
 	printLine(direction);
-	std::cerr << byteArrayToString(ByteArray(data.begin(), data.end())) << std::endl;
+	std::cerr << beautifier->beautify(byteArrayToString(ByteArray(data.begin(), data.end()))) << std::endl;
 }
 
 void ClientXMLTracer::printLine(char c) {
diff --git a/Swiften/Client/ClientXMLTracer.h b/Swiften/Client/ClientXMLTracer.h
index dd94e0e..0752faa 100644
--- a/Swiften/Client/ClientXMLTracer.h
+++ b/Swiften/Client/ClientXMLTracer.h
@@ -7,15 +7,19 @@
 #pragma once
 
 #include <Swiften/Client/CoreClient.h>
+#include <Swiften/Client/XMLBeautifier.h>
 #include <Swiften/Base/SafeByteArray.h>
 
 namespace Swift {
 	class ClientXMLTracer {
 		public:
 			ClientXMLTracer(CoreClient* client);
+			~ClientXMLTracer();
+		private:
+			void printData(char direction, const SafeByteArray& data);
+			void printLine(char c);
 
 		private:
-			static void printData(char direction, const SafeByteArray& data);
-			static void printLine(char c);
+			XMLBeautifier *beautifier;
 	};
 }
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index cceec74..37055e4 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -276,6 +276,7 @@ void CoreClient::handleDataWritten(const SafeByteArray& data) {
 
 void CoreClient::handleStanzaChannelAvailableChanged(bool available) {
 	if (available) {
+		handleConnected();
 		onConnected();
 	}
 }
diff --git a/Swiften/Client/CoreClient.h b/Swiften/Client/CoreClient.h
index 16813de..3472e76 100644
--- a/Swiften/Client/CoreClient.h
+++ b/Swiften/Client/CoreClient.h
@@ -188,6 +188,15 @@ namespace Swift {
 				return session_;
 			}
 
+			NetworkFactories* getNetworkFactories() const {
+				return networkFactories;
+			}
+
+			/**
+			 * Called before onConnected signal is emmitted.
+			 */
+			virtual void handleConnected() {};
+
 		private:
 			void handleConnectorFinished(boost::shared_ptr<Connection>);
 			void handleStanzaChannelAvailableChanged(bool available);
diff --git a/Swiften/Client/XMLBeautifier.cpp b/Swiften/Client/XMLBeautifier.cpp
new file mode 100644
index 0000000..b70fc48
--- /dev/null
+++ b/Swiften/Client/XMLBeautifier.cpp
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2011 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#include <sstream>
+#include <stack>
+
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/Log.h>
+#include <Swiften/Client/XMLBeautifier.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
+
+namespace Swift {
+
+XMLBeautifier::XMLBeautifier(bool indention, bool coloring) : doIndention(indention), doColoring(coloring), intLevel(0), parser(NULL), lastWasStepDown(false) {
+	factory = new PlatformXMLParserFactory();
+}
+
+XMLBeautifier::~XMLBeautifier() {
+	delete factory;
+}
+
+std::string XMLBeautifier::beautify(const std::string &text) {
+	parser = factory->createXMLParser(this);
+	intLevel = 0;
+	buffer.str(std::string());
+	parser->parse(text);
+	delete parser;
+	return buffer.str();
+}
+
+void XMLBeautifier::indent() {
+	for (int i = 0; i < intLevel; ++i) {
+		buffer << " ";
+	}
+}
+
+// all bold but reset
+const char colorBlue[] = "\x1b[01;34m";
+const char colorCyan[] = "\x1b[01;36m";
+const char colorGreen[] = "\x1b[01;32m";
+const char colorMagenta[] = "\x1b[01;35m";
+const char colorRed[] = "\x1b[01;31m";
+const char colorReset[] = "\x1b[0m";
+const char colorYellow[] = "\x1b[01;33m";
+
+
+
+std::string XMLBeautifier::styleTag(const std::string& text) const {
+	std::string result;
+	result += colorYellow;
+	result += text;
+	result += colorReset;
+	return result;
+}
+
+std::string XMLBeautifier::styleNamespace(const std::string& text) const {
+	std::string result;
+	result += colorRed;
+	result += text;
+	result += colorReset;
+	return result;
+}
+
+std::string XMLBeautifier::styleAttribute(const std::string& text) const {
+	std::string result;
+	result += colorGreen;
+	result += text;
+	result += colorReset;
+	return result;
+}
+std::string XMLBeautifier::styleValue(const std::string& text) const {
+	std::string result;
+	result += colorCyan;
+	result += text;
+	result += colorReset;
+	return result;
+}
+
+void XMLBeautifier::handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes) {
+	if (doIndention) {
+		if (intLevel) buffer << std::endl;
+	}
+	indent();
+	buffer << "<" << (doColoring ? styleTag(element) : element);
+	if (!ns.empty() && (!parentNSs.empty() && parentNSs.top() != ns)) {
+		buffer << " ";
+		buffer << (doColoring ? styleAttribute("xmlns") : "xmlns");
+		buffer << "=";
+		buffer << "\"" << (doColoring ? styleNamespace(ns) : ns) << "\"";
+	}
+	if (!attributes.getEntries().empty()) {
+		foreach(AttributeMap::Entry entry, attributes.getEntries()) {
+			buffer << " ";
+			buffer << (doColoring ? styleAttribute(entry.getAttribute().getName()) : entry.getAttribute().getName());
+			buffer << "=";
+			buffer << "\"" << (doColoring ? styleValue(entry.getValue()) : entry.getValue()) << "\"";
+		}
+	}
+	buffer << ">";
+	++intLevel;
+	lastWasStepDown = false;
+	parentNSs.push(ns);
+}
+
+void XMLBeautifier::handleEndElement(const std::string& element, const std::string& /* ns */) {
+	--intLevel;
+	parentNSs.pop();
+	if (/*hadCDATA.top() ||*/ lastWasStepDown) {
+		if (doIndention) {
+			buffer << std::endl;
+		}
+		indent();
+	}
+	buffer << "</" << (doColoring ? styleTag(element) : element) << ">";
+	lastWasStepDown = true;
+}
+
+void XMLBeautifier::handleCharacterData(const std::string& data) {
+	buffer << data;
+	lastWasStepDown = false;
+}
+
+}
diff --git a/Swiften/Client/XMLBeautifier.h b/Swiften/Client/XMLBeautifier.h
new file mode 100644
index 0000000..44dfd20
--- /dev/null
+++ b/Swiften/Client/XMLBeautifier.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <string>
+#include <stack>
+
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Parser/XMLParserFactory.h>
+#include <Swiften/Parser/XMLParserClient.h>
+#include <Swiften/Parser/XMLParser.h>
+
+namespace Swift {
+
+class XMLBeautifier : public XMLParserClient {
+public:
+	XMLBeautifier(bool indention, bool coloring);
+	virtual ~XMLBeautifier();
+
+	std::string beautify(const std::string&);
+
+private:
+	void handleStartElement(const std::string& element, const std::string& ns, const AttributeMap& attributes);
+	void handleEndElement(const std::string& element, const std::string& ns);
+	void handleCharacterData(const std::string& data);
+
+private:
+	void indent();
+
+private:
+	std::string styleTag(const std::string& text) const;
+	std::string styleNamespace(const std::string& text) const;
+	std::string styleAttribute(const std::string& text) const;
+	std::string styleValue(const std::string& text) const;
+
+private:
+	bool doIndention;
+	bool doColoring;
+
+	int intLevel;
+	std::string inputBuffer;
+	std::stringstream buffer;
+	XMLParserFactory* factory;
+	XMLParser* parser;
+
+	bool lastWasStepDown;
+	std::stack<std::string> parentNSs;
+};
+}