Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-08-28 14:44:32 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-08-28 14:44:32 (GMT)
commit5dc7d1459b966ba5b848760bc43cbb1242d5da80 (patch)
tree140c78dc162b79f0f01bb6358d8d645f16e9df98
parentd5a0dcb28c5738660ee56483ad305a0075f71799 (diff)
parenteba9a50f10082430c38b849b6af95f92f3de6ef8 (diff)
downloadswift-contrib-5dc7d1459b966ba5b848760bc43cbb1242d5da80.zip
swift-contrib-5dc7d1459b966ba5b848760bc43cbb1242d5da80.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Keep VCard photo hash cache consistent. Fix assertion on inconsistent VCard photohash cache. Conflicts: Swift/Controllers/Storages/VCardFileStorage.cpp Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
Diffstat
-rw-r--r--Swift/Controllers/Storages/VCardFileStorage.cpp4
-rw-r--r--Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp53
-rw-r--r--Swiften/Avatars/VCardAvatarManager.cpp9
3 files changed, 60 insertions, 6 deletions
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 3dff06f..d799a90 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -52,7 +52,9 @@ VCardFileStorage::VCardFileStorage(boost::filesystem::path dir) : vcardsPath(dir
}
boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const {
- return VCardPersister().loadPayloadGeneric(getVCardPath(jid));
+ boost::shared_ptr<VCard> result = VCardPersister().loadPayloadGeneric(getVCardPath(jid));
+ getAndUpdatePhotoHash(jid, result);
+ return result;
}
void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) {
diff --git a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
index bd96b2d..81dc12c 100644
--- a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
+++ b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp
@@ -14,8 +14,8 @@
#include <Swiften/Elements/VCard.h>
#include <Swiften/Avatars/VCardAvatarManager.h>
#include <Swiften/Avatars/AvatarMemoryStorage.h>
-#include <Swiften/VCards/VCardMemoryStorage.h>
#include <Swiften/VCards/VCardManager.h>
+#include <Swiften/VCards/VCardStorage.h>
#include <Swiften/MUC/MUCRegistry.h>
#include <Swiften/Queries/IQRouter.h>
#include <Swiften/Client/DummyStanzaChannel.h>
@@ -31,9 +31,46 @@ class VCardAvatarManagerTest : public CppUnit::TestFixture {
CPPUNIT_TEST(testGetAvatarHashUnknownAvatarKnownVCardStoresAvatar);
CPPUNIT_TEST(testGetAvatarHashUnknownAvatarUnknownVCard);
CPPUNIT_TEST(testVCardUpdateTriggersUpdate);
+ CPPUNIT_TEST(testGetAvatarHashKnownAvatarUnknownVCard);
CPPUNIT_TEST_SUITE_END();
public:
+ class TestVCardStorage : public VCardStorage {
+ public:
+ virtual VCard::ref getVCard(const JID& jid) const {
+ VCardMap::const_iterator i = vcards.find(jid);
+ if (i != vcards.end()) {
+ return i->second;
+ }
+ else {
+ return VCard::ref();
+ }
+ }
+
+ virtual void setVCard(const JID& jid, VCard::ref v) {
+ vcards[jid] = v;
+ }
+
+ std::string getPhotoHash(const JID& jid) const {
+ if (photoHashes.find(jid) != photoHashes.end()) {
+ return photoHashes.find(jid)->second;
+ }
+ VCard::ref vCard = getVCard(jid);
+ if (vCard && !vCard->getPhoto().empty()) {
+ return Hexify::hexify(SHA1::getHash(vCard->getPhoto()));
+ }
+ else {
+ return "";
+ }
+ }
+
+ std::map<JID, std::string> photoHashes;
+
+ private:
+ typedef std::map<JID, VCard::ref> VCardMap;
+ VCardMap vcards;
+ };
+
void setUp() {
ownJID = JID("foo@fum.com/bum");
stanzaChannel = new DummyStanzaChannel();
@@ -41,7 +78,7 @@ class VCardAvatarManagerTest : public CppUnit::TestFixture {
iqRouter = new IQRouter(stanzaChannel);
mucRegistry = new DummyMUCRegistry();
avatarStorage = new AvatarMemoryStorage();
- vcardStorage = new VCardMemoryStorage();
+ vcardStorage = new TestVCardStorage();
vcardManager = new VCardManager(ownJID, iqRouter, vcardStorage);
avatar1 = createByteArray("abcdefg");
avatar1Hash = Hexify::hexify(SHA1::getHash(avatar1));
@@ -96,6 +133,16 @@ class VCardAvatarManagerTest : public CppUnit::TestFixture {
CPPUNIT_ASSERT_EQUAL(std::string(), result);
}
+ void testGetAvatarHashKnownAvatarUnknownVCard() {
+ boost::shared_ptr<VCardAvatarManager> testling = createManager();
+ vcardStorage->photoHashes[user1.toBare()] = avatar1Hash;
+
+ std::string result = testling->getAvatarHash(user1);
+
+ CPPUNIT_ASSERT_EQUAL(std::string(), result);
+ }
+
+
void testVCardUpdateTriggersUpdate() {
boost::shared_ptr<VCardAvatarManager> testling = createManager();
vcardManager->requestVCard(user1);
@@ -144,7 +191,7 @@ class VCardAvatarManagerTest : public CppUnit::TestFixture {
DummyMUCRegistry* mucRegistry;
AvatarMemoryStorage* avatarStorage;
VCardManager* vcardManager;
- VCardMemoryStorage* vcardStorage;
+ TestVCardStorage* vcardStorage;
ByteArray avatar1;
std::string avatar1Hash;
std::vector<JID> changes;
diff --git a/Swiften/Avatars/VCardAvatarManager.cpp b/Swiften/Avatars/VCardAvatarManager.cpp
index 84f94d5..c9571c3 100644
--- a/Swiften/Avatars/VCardAvatarManager.cpp
+++ b/Swiften/Avatars/VCardAvatarManager.cpp
@@ -34,8 +34,13 @@ std::string VCardAvatarManager::getAvatarHash(const JID& jid) const {
if (!hash.empty()) {
if (!avatarStorage_->hasAvatar(hash)) {
VCard::ref vCard = vcardManager_->getVCard(avatarJID);
- assert(vCard);
- avatarStorage_->addAvatar(hash, vCard->getPhoto());
+ if (vCard) {
+ avatarStorage_->addAvatar(hash, vCard->getPhoto());
+ }
+ else {
+ // Can happen if the cache is inconsistent.
+ hash = "";
+ }
}
}
return hash;