7 files changed, 34 insertions, 98 deletions
diff --git a/Swiften/Disco/CapsFileStorage.cpp b/Swiften/Disco/CapsFileStorage.cpp
deleted file mode 100644
index 1e53854..0000000
--- a/Swiften/Disco/CapsFileStorage.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include "Swiften/Disco/CapsFileStorage.h"
-
-#include <iostream>
-#include <boost/filesystem/fstream.hpp>
-
-#include "Swiften/Base/ByteArray.h"
-#include "Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h"
-#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h"
-#include "Swiften/Parser/PayloadParsers/DiscoInfoParser.h"
-#include "Swiften/StringCodecs/Hexify.h"
-#include "Swiften/StringCodecs/Base64.h"
-
-namespace Swift {
-
-CapsFileStorage::CapsFileStorage(const boost::filesystem::path& path) : path(path) {
-}
-
-DiscoInfo::ref CapsFileStorage::getDiscoInfo(const std::string& hash) const {
-	boost::filesystem::path capsPath(getCapsPath(hash));
-	if (boost::filesystem::exists(capsPath)) {
-		ByteArray data;
-		data.readFromFile(capsPath.string());
-
-		DiscoInfoParser parser;
-		PayloadParserTester tester(&parser);
-		tester.parse(data.toString());
-		return boost::dynamic_pointer_cast<DiscoInfo>(parser.getPayload());
-	}
-	else {
-		return DiscoInfo::ref();
-	}
-}
-
-void CapsFileStorage::setDiscoInfo(const std::string& hash, DiscoInfo::ref discoInfo) {
-	boost::filesystem::path capsPath(getCapsPath(hash));
-	if (!boost::filesystem::exists(capsPath.parent_path())) {
-		try {
-			boost::filesystem::create_directories(capsPath.parent_path());
-		}
-		catch (const boost::filesystem::filesystem_error& e) {
-			std::cerr << "ERROR: " << e.what() << std::endl;
-		}
-	}
-	DiscoInfo::ref bareDiscoInfo(new DiscoInfo(*discoInfo.get()));
-	bareDiscoInfo->setNode("");
-	boost::filesystem::ofstream file(capsPath);
-	file << DiscoInfoSerializer().serializePayload(bareDiscoInfo);
-	file.close();
-}
-
-boost::filesystem::path CapsFileStorage::getCapsPath(const std::string& hash) const {
-	return path / (Hexify::hexify(Base64::decode(hash)) + ".xml");
-}
-
-}
diff --git a/Swiften/Disco/CapsFileStorage.h b/Swiften/Disco/CapsFileStorage.h
deleted file mode 100644
index 5faf08b..0000000
--- a/Swiften/Disco/CapsFileStorage.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <boost/filesystem.hpp>
-
-#include "Swiften/Disco/CapsStorage.h"
-#include <string>
-
-namespace Swift {
-	class CapsFileStorage : public CapsStorage {
-		public:
-			CapsFileStorage(const boost::filesystem::path& path);
-
-			virtual DiscoInfo::ref getDiscoInfo(const std::string& hash) const;
-			virtual void setDiscoInfo(const std::string& hash, DiscoInfo::ref discoInfo);
-
-		private:
-			boost::filesystem::path getCapsPath(const std::string& hash) const;
-
-		private:
-			boost::filesystem::path path;
-	};
-}
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp
index 63166e6..6eb7c17 100644
--- a/Swiften/Disco/CapsManager.cpp
+++ b/Swiften/Disco/CapsManager.cpp
@@ -7,6 +7,7 @@
 #include "Swiften/Disco/CapsManager.h"
 
 #include <boost/bind.hpp>
+#include <iostream>
 
 #include "Swiften/Client/StanzaChannel.h"
 #include "Swiften/Disco/CapsStorage.h"
diff --git a/Swiften/Disco/DummyEntityCapsProvider.cpp b/Swiften/Disco/DummyEntityCapsProvider.cpp
new file mode 100644
index 0000000..a906652
--- /dev/null
+++ b/Swiften/Disco/DummyEntityCapsProvider.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2010 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include <Swiften/Disco/DummyEntityCapsProvider.h>
+
+#include <iostream>
+
+namespace Swift {
+
+DiscoInfo::ref DummyEntityCapsProvider::getCaps(const JID& jid) const {
+	std::map<JID, DiscoInfo::ref>::const_iterator i = caps.find(jid);
+	if (i != caps.end()) {
+		return i->second;
+	}
+	return DiscoInfo::ref();
+}
+
+}
diff --git a/Swiften/Disco/DummyEntityCapsProvider.h b/Swiften/Disco/DummyEntityCapsProvider.h
index 68cef2f..1bd4bb9 100644
--- a/Swiften/Disco/DummyEntityCapsProvider.h
+++ b/Swiften/Disco/DummyEntityCapsProvider.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <map>
-#include <iostream>
+
 #include "Swiften/Disco/EntityCapsProvider.h"
 
 namespace Swift {
@@ -16,13 +16,7 @@ namespace Swift {
 			DummyEntityCapsProvider() {
 			}
 
-			DiscoInfo::ref getCaps(const JID& jid) const {
-				std::map<JID, DiscoInfo::ref>::const_iterator i = caps.find(jid);
-				if (i != caps.end()) {
-					return i->second;
-				}
-				return DiscoInfo::ref();
-			}
+			DiscoInfo::ref getCaps(const JID& jid) const;
 
 			std::map<JID, DiscoInfo::ref> caps;
 	};
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/Disco/SConscript b/Swiften/Disco/SConscript
index 9982192..434018a 100644
--- a/Swiften/Disco/SConscript
+++ b/Swiften/Disco/SConscript
@@ -5,8 +5,8 @@ objects = swiften_env.SwiftenObject([
 			"CapsManager.cpp",
 			"EntityCapsManager.cpp",
 			"EntityCapsProvider.cpp",
+			"DummyEntityCapsProvider.cpp",
 			"CapsStorage.cpp",
-			"CapsFileStorage.cpp",
 			"ClientDiscoManager.cpp",
 			"DiscoInfoResponder.cpp",
 			"JIDDiscoInfoResponder.cpp",