16 files changed, 243 insertions, 1 deletions
diff --git a/Swiften/Application/Application.cpp b/Swiften/Application/Application.cpp
index e21d9e7..6ffb46f 100644
--- a/Swiften/Application/Application.cpp
+++ b/Swiften/Application/Application.cpp
@@ -17,6 +17,10 @@ boost::filesystem::path Application::getSettingsFileName() const {
 	return getSettingsDir() / "settings";
 }
 
+boost::filesystem::path Application::getAvatarDir() const {
+	return getSettingsDir() / "avatars";
+}
+
 boost::filesystem::path Application::getHomeDir() const {
 	// FIXME: Does this work on windows?
 	char* homeDirRaw = getenv("HOME");
diff --git a/Swiften/Application/Application.h b/Swiften/Application/Application.h
index 4fda7af..a65b1de 100644
--- a/Swiften/Application/Application.h
+++ b/Swiften/Application/Application.h
@@ -14,6 +14,7 @@ namespace Swift {
 			virtual ~Application();
 
 			boost::filesystem::path getSettingsFileName() const;
+			boost::filesystem::path getAvatarDir() const;
 			boost::filesystem::path getHomeDir() const;
 			virtual boost::filesystem::path getSettingsDir() const = 0;
 			boost::filesystem::path getProfileDir(const String& profile) const;
diff --git a/Swiften/Avatars/AvatarFileStorage.cpp b/Swiften/Avatars/AvatarFileStorage.cpp
new file mode 100644
index 0000000..1348018
--- /dev/null
+++ b/Swiften/Avatars/AvatarFileStorage.cpp
@@ -0,0 +1,26 @@
+#include "Swiften/Avatars/AvatarFileStorage.h"
+
+#include <iostream>
+#include <boost/filesystem/fstream.hpp>
+
+namespace Swift {
+
+AvatarFileStorage::AvatarFileStorage(const boost::filesystem::path& path) : path_(path) {
+	boost::filesystem::create_directory(path_);
+}
+
+bool AvatarFileStorage::hasAvatar(const String& hash) const { 
+	return boost::filesystem::exists(getAvatarPath(hash));
+}
+
+void AvatarFileStorage::addAvatar(const String& hash, const ByteArray& avatar) {
+	boost::filesystem::ofstream file(getAvatarPath(hash), boost::filesystem::ofstream::binary|boost::filesystem::ofstream::out);
+	file.write(avatar.getData(), avatar.getSize());
+	file.close();
+}
+
+boost::filesystem::path AvatarFileStorage::getAvatarPath(const String& hash) const {
+	return path_ / hash.getUTF8String();
+}
+
+}
diff --git a/Swiften/Avatars/AvatarFileStorage.h b/Swiften/Avatars/AvatarFileStorage.h
new file mode 100644
index 0000000..1afa703
--- /dev/null
+++ b/Swiften/Avatars/AvatarFileStorage.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <map>
+#include <boost/filesystem.hpp>
+
+#include "Swiften/Base/String.h"
+#include "Swiften/Base/ByteArray.h"
+#include "Swiften/Avatars/AvatarStorage.h"
+
+namespace Swift {
+	class AvatarFileStorage : public AvatarStorage {
+		public:
+			AvatarFileStorage(const boost::filesystem::path& path);
+
+			virtual bool hasAvatar(const String& hash) const;
+			virtual void addAvatar(const String& hash, const ByteArray& avatar);
+
+			virtual boost::filesystem::path getAvatarPath(const String& hash) const;
+
+		private:
+			boost::filesystem::path path_;
+	};
+
+}
diff --git a/Swiften/Avatars/AvatarManager.cpp b/Swiften/Avatars/AvatarManager.cpp
new file mode 100644
index 0000000..f0b04b9
--- /dev/null
+++ b/Swiften/Avatars/AvatarManager.cpp
@@ -0,0 +1,65 @@
+#include "Swiften/Avatars/AvatarManager.h"
+
+#include <boost/bind.hpp>
+
+#include "Swiften/Client/StanzaChannel.h"
+#include "Swiften/Elements/VCardUpdate.h"
+#include "Swiften/Queries/Requests/GetVCardRequest.h"
+#include "Swiften/StringCodecs/SHA1.h"
+#include "Swiften/Avatars/AvatarStorage.h"
+
+namespace Swift {
+
+AvatarManager::AvatarManager(StanzaChannel* stanzaChannel, IQRouter* iqRouter, AvatarStorage* avatarStorage) : stanzaChannel_(stanzaChannel), iqRouter_(iqRouter), avatarStorage_(avatarStorage) {
+	stanzaChannel->onPresenceReceived.connect(boost::bind(&AvatarManager::handlePresenceReceived, this, _1));
+}
+
+void AvatarManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) {
+	boost::shared_ptr<VCardUpdate> update = presence->getPayload<VCardUpdate>();
+	if (!update) {
+		return;
+	}
+	JID from = presence->getFrom().toBare();
+	String& hash = avatarHashes_[from];
+	if (hash != update->getPhotoHash()) {
+		hash = update->getPhotoHash();
+		if (!avatarStorage_->hasAvatar(hash)) {
+			boost::shared_ptr<GetVCardRequest> request(new GetVCardRequest(from, iqRouter_));
+			request->onResponse.connect(boost::bind(&AvatarManager::handleVCardReceived, this, from, _1, _2));
+			request->send();
+		}
+		else {
+			onAvatarChanged(from, hash);
+		}
+	}
+}
+
+void AvatarManager::handleVCardReceived(JID from, boost::shared_ptr<VCard> vCard, const boost::optional<Error>& error) {
+	if (error) {
+		// FIXME: What to do here?
+		return;
+	}
+	String hash = SHA1::getHexHash(vCard->getPhoto());
+	avatarStorage_->addAvatar(hash, vCard->getPhoto());
+	onAvatarChanged(from, hash);
+}
+
+String AvatarManager::getAvatarHash(const JID& jid) const {
+	std::map<JID, String>::const_iterator i = avatarHashes_.find(jid.toBare());
+	if (i != avatarHashes_.end()) {
+		return i->second;
+	}
+	else {
+		return "";
+	}
+}
+
+boost::filesystem::path AvatarManager::getAvatarPath(const JID& jid) const {
+	String hash = getAvatarHash(jid);
+	if (!hash.isEmpty()) {
+		return avatarStorage_->getAvatarPath(hash);
+	}
+	return boost::filesystem::path();
+}
+
+}
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h
new file mode 100644
index 0000000..0085405
--- /dev/null
+++ b/Swiften/Avatars/AvatarManager.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+#include <boost/signal.hpp>
+#include <map>
+
+#include "Swiften/JID/JID.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Elements/VCard.h"
+#include "Swiften/Elements/Error.h"
+
+namespace Swift {
+	class AvatarStorage;
+	class StanzaChannel;
+	class IQRouter;
+
+	class AvatarManager {
+		public:
+			AvatarManager(StanzaChannel*, IQRouter*, AvatarStorage*);
+
+			String getAvatarHash(const JID&) const;
+			boost::filesystem::path getAvatarPath(const JID&) const;
+
+		public:
+			boost::signal<void (const JID&, const String&)> onAvatarChanged;
+
+		private:
+			void handlePresenceReceived(boost::shared_ptr<Presence>);
+			void handleVCardReceived(JID from, boost::shared_ptr<VCard>, const boost::optional<Error>&);
+
+		private:
+			StanzaChannel* stanzaChannel_;
+			IQRouter* iqRouter_;
+			AvatarStorage* avatarStorage_;
+			std::map<JID, String> avatarHashes_;
+	};
+}
diff --git a/Swiften/Avatars/AvatarStorage.cpp b/Swiften/Avatars/AvatarStorage.cpp
new file mode 100644
index 0000000..4c98314
--- /dev/null
+++ b/Swiften/Avatars/AvatarStorage.cpp
@@ -0,0 +1,8 @@
+#include "Swiften/Avatars/AvatarStorage.h"
+
+namespace Swift {
+
+AvatarStorage::~AvatarStorage() {
+}
+
+}
diff --git a/Swiften/Avatars/AvatarStorage.h b/Swiften/Avatars/AvatarStorage.h
new file mode 100644
index 0000000..b5c0f32
--- /dev/null
+++ b/Swiften/Avatars/AvatarStorage.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <boost/filesystem.hpp>
+
+namespace Swift {
+	class String;
+	class ByteArray;
+
+	class AvatarStorage {
+		public:
+			virtual ~AvatarStorage();
+
+			virtual bool hasAvatar(const String& hash) const = 0;
+			virtual void addAvatar(const String& hash, const ByteArray& avatar) = 0;
+			virtual boost::filesystem::path getAvatarPath(const String& hash) const = 0;
+	};
+
+}
diff --git a/Swiften/Avatars/Makefile.inc b/Swiften/Avatars/Makefile.inc
new file mode 100644
index 0000000..4887a49
--- /dev/null
+++ b/Swiften/Avatars/Makefile.inc
@@ -0,0 +1,6 @@
+SWIFTEN_SOURCES += \
+	Swiften/Avatars/AvatarManager.cpp \
+	Swiften/Avatars/AvatarStorage.cpp \
+	Swiften/Avatars/AvatarFileStorage.cpp
+
+include Swiften/Avatars/UnitTest/Makefile.inc
diff --git a/Swiften/Avatars/UnitTest/Makefile.inc b/Swiften/Avatars/UnitTest/Makefile.inc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Swiften/Avatars/UnitTest/Makefile.inc
diff --git a/Swiften/Makefile.inc b/Swiften/Makefile.inc
index ce14110..4b09bf3 100644
--- a/Swiften/Makefile.inc
+++ b/Swiften/Makefile.inc
@@ -20,6 +20,7 @@ include Swiften/Disco/Makefile.inc
 include Swiften/Presence/Makefile.inc
 include Swiften/Notifier/Makefile.inc
 include Swiften/History/Makefile.inc
+include Swiften/Avatars/Makefile.inc
 
 CPPFLAGS += $(SQLITE_CPPFLAGS)
 
diff --git a/Swiften/Queries/Requests/GetVCardRequest.h b/Swiften/Queries/Requests/GetVCardRequest.h
new file mode 100644
index 0000000..e403096
--- /dev/null
+++ b/Swiften/Queries/Requests/GetVCardRequest.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <cassert>
+
+#include "Swiften/Queries/GenericRequest.h"
+#include "Swiften/Elements/VCard.h"
+
+namespace Swift {
+	class GetVCardRequest : public GenericRequest<VCard> {
+		public:
+			GetVCardRequest(const JID& jid, IQRouter* router) :
+					GenericRequest<VCard>(IQ::Get, jid, boost::shared_ptr<Payload>(new VCard()), router) {
+				assert(jid.isBare());
+			}
+	};
+}
diff --git a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
index 9799802..f9a0789 100644
--- a/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
+++ b/Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp
@@ -15,6 +15,7 @@
 #include "Swiften/Serializer/PayloadSerializers/StartSessionSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h"
 #include "Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h"
+#include "Swiften/Serializer/PayloadSerializers/VCardSerializer.h"
 
 namespace Swift {
 
@@ -33,6 +34,7 @@ FullPayloadSerializerCollection::FullPayloadSerializerCollection() {
 	serializers_.push_back(new StartSessionSerializer());
 	serializers_.push_back(new SecurityLabelSerializer());
 	serializers_.push_back(new SecurityLabelsCatalogSerializer());
+	serializers_.push_back(new VCardSerializer());
 	foreach(PayloadSerializer* serializer, serializers_) {
 		addSerializer(serializer);
 	}
diff --git a/Swiften/Serializer/PayloadSerializers/Makefile.inc b/Swiften/Serializer/PayloadSerializers/Makefile.inc
index 61f603a..893da6c 100644
--- a/Swiften/Serializer/PayloadSerializers/Makefile.inc
+++ b/Swiften/Serializer/PayloadSerializers/Makefile.inc
@@ -8,6 +8,7 @@ SWIFTEN_SOURCES += \
 	Swiften/Serializer/PayloadSerializers/CapsInfoSerializer.cpp \
 	Swiften/Serializer/PayloadSerializers/ResourceBindSerializer.cpp \
 	Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp \
-	Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp
+	Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp \
+	Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
 
 include Swiften/Serializer/PayloadSerializers/UnitTest/Makefile.inc
diff --git a/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
new file mode 100644
index 0000000..ce4e399
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp
@@ -0,0 +1,18 @@
+#include "Swiften/Serializer/PayloadSerializers/VCardSerializer.h"
+
+#include <boost/shared_ptr.hpp>
+
+#include "Swiften/Serializer/XML/XMLElement.h"
+
+namespace Swift {
+
+VCardSerializer::VCardSerializer() : GenericPayloadSerializer<VCard>() {
+}
+
+String VCardSerializer::serializePayload(boost::shared_ptr<VCard> discoInfo)  const {
+	XMLElement queryElement("vCard", "vcard-temp");
+	// TODO
+	return queryElement.serialize();
+}
+
+}
diff --git a/Swiften/Serializer/PayloadSerializers/VCardSerializer.h b/Swiften/Serializer/PayloadSerializers/VCardSerializer.h
new file mode 100644
index 0000000..baf5947
--- /dev/null
+++ b/Swiften/Serializer/PayloadSerializers/VCardSerializer.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "Swiften/Serializer/GenericPayloadSerializer.h"
+#include "Swiften/Elements/VCard.h"
+
+namespace Swift {
+	class VCardSerializer : public GenericPayloadSerializer<VCard> {
+		public:
+			VCardSerializer();
+
+			virtual String serializePayload(boost::shared_ptr<VCard>)  const;
+	};
+}