summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-03 13:48:37 (GMT)
committerSwift Review <review@swift.im>2014-10-08 07:37:33 (GMT)
commit3e40b302af0e2abde3c002c7f25ec5276f68f230 (patch)
treecb73311e851d00364d22de1da978e45553b43912 /Swiften
parentb67aba2e28e5fd716c18bef9c2826b482ef832ad (diff)
downloadswift-contrib-3e40b302af0e2abde3c002c7f25ec5276f68f230.zip
swift-contrib-3e40b302af0e2abde3c002c7f25ec5276f68f230.tar.bz2
Update vCard cache on 'Show Profile' if cached vCard is older than 5 minutes.
Store last write time in memory in VCardStorage. VCardManager::getVCardAndRequestWhenNeeded will check an optional parameter and the last write time to determine if the cached vCard is fresh enough. Test-Information: ALl unit tests still run fine and tested that it fetches the vCard again when you open the 'Show Profile' dialog after 5 minutes. Change-Id: I27d7f931188a43aa090348014bcdbdf6d534c5a0
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/VCards/VCardManager.cpp9
-rw-r--r--Swiften/VCards/VCardManager.h6
-rw-r--r--Swiften/VCards/VCardMemoryStorage.h15
-rw-r--r--Swiften/VCards/VCardStorage.h5
4 files changed, 28 insertions, 7 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp
index 52447a1..5a65dcd 100644
--- a/Swiften/VCards/VCardManager.cpp
+++ b/Swiften/VCards/VCardManager.cpp
@@ -1,39 +1,42 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#include <Swiften/VCards/VCardManager.h>
#include <boost/bind.hpp>
+#include <Swiften/Base/Log.h>
#include <Swiften/JID/JID.h>
#include <Swiften/VCards/VCardStorage.h>
#include <Swiften/VCards/GetVCardRequest.h>
namespace Swift {
VCardManager::VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage) : ownJID(ownJID), iqRouter(iqRouter), storage(vcardStorage) {
}
VCardManager::~VCardManager() {
}
VCard::ref VCardManager::getVCard(const JID& jid) const {
return storage->getVCard(jid);
}
-VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid) {
+VCard::ref VCardManager::getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge) {
VCard::ref vcard = storage->getVCard(jid);
- if (!vcard) {
+ boost::posix_time::ptime vcardFetchedTime = storage->getVCardWriteTime(jid);
+ bool vcardTooOld = vcard && (vcardFetchedTime.is_special() || ((boost::posix_time::second_clock::universal_time() - vcardFetchedTime) > allowedAge));
+ if (!vcard || vcardTooOld) {
requestVCard(jid);
}
return vcard;
}
void VCardManager::requestVCard(const JID& requestedJID) {
JID jid = requestedJID.equals(ownJID, JID::WithoutResource) ? JID() : requestedJID;
if (requestedVCards.find(jid) != requestedVCards.end()) {
return;
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index b7e3c32..78e0f3e 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,38 +1,40 @@
/*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
#include <set>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
#include <Swiften/Base/API.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Elements/VCard.h>
#include <Swiften/Elements/ErrorPayload.h>
#include <Swiften/VCards/SetVCardRequest.h>
#include <Swiften/Base/boost_bsignals.h>
namespace Swift {
class JID;
class VCardStorage;
class IQRouter;
class SWIFTEN_API VCardManager : public boost::bsignals::trackable {
public:
VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage);
~VCardManager();
VCard::ref getVCard(const JID& jid) const;
- VCard::ref getVCardAndRequestWhenNeeded(const JID& jid);
+ VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin));
void requestVCard(const JID& jid);
void requestOwnVCard();
std::string getPhotoHash(const JID& jid) const;
SetVCardRequest::ref createSetVCardRequest(VCard::ref);
public:
diff --git a/Swiften/VCards/VCardMemoryStorage.h b/Swiften/VCards/VCardMemoryStorage.h
index 86ae1b2..f538fc1 100644
--- a/Swiften/VCards/VCardMemoryStorage.h
+++ b/Swiften/VCards/VCardMemoryStorage.h
@@ -1,18 +1,19 @@
/*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
#include <boost/shared_ptr.hpp>
+
#include <map>
#include <Swiften/JID/JID.h>
#include <Swiften/VCards/VCardStorage.h>
namespace Swift {
class VCardMemoryStorage : public VCardStorage {
public:
VCardMemoryStorage(CryptoProvider* crypto) : VCardStorage(crypto) {}
@@ -21,18 +22,30 @@ namespace Swift {
VCardMap::const_iterator i = vcards.find(jid);
if (i != vcards.end()) {
return i->second;
}
else {
return VCard::ref();
}
}
+ virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const {
+ if (vcardWriteTimes.find(jid) == vcardWriteTimes.end()) {
+ return boost::posix_time::ptime();
+ }
+ else {
+ return vcardWriteTimes.at(jid);
+ }
+ }
+
virtual void setVCard(const JID& jid, VCard::ref v) {
vcards[jid] = v;
+ vcardWriteTimes[jid] = boost::posix_time::second_clock::universal_time();
}
private:
typedef std::map<JID, VCard::ref> VCardMap;
+ typedef std::map<JID, boost::posix_time::ptime> VCardWriteTimeMap;
VCardMap vcards;
+ VCardWriteTimeMap vcardWriteTimes;
};
}
diff --git a/Swiften/VCards/VCardStorage.h b/Swiften/VCards/VCardStorage.h
index 924204c..e6c84f4 100644
--- a/Swiften/VCards/VCardStorage.h
+++ b/Swiften/VCards/VCardStorage.h
@@ -1,32 +1,35 @@
/*
- * Copyright (c) 2010-2013 Remko Tronçon
+ * Copyright (c) 2010-2014 Remko Tronçon
* Licensed under the GNU General Public License v3.
* See Documentation/Licenses/GPLv3.txt for more information.
*/
#pragma once
#include <string>
+
#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
#include <Swiften/Base/API.h>
#include <Swiften/Elements/VCard.h>
namespace Swift {
class JID;
class CryptoProvider;
class SWIFTEN_API VCardStorage {
public:
VCardStorage(CryptoProvider*);
virtual ~VCardStorage();
virtual VCard::ref getVCard(const JID& jid) const = 0;
+ virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const = 0;
virtual void setVCard(const JID&, VCard::ref) = 0;
virtual std::string getPhotoHash(const JID&) const;
private:
CryptoProvider* crypto;
};
}