Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-03 13:48:37 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-10-08 07:37:33 (GMT) |
| commit | 3e40b302af0e2abde3c002c7f25ec5276f68f230 (patch) | |
| tree | cb73311e851d00364d22de1da978e45553b43912 /Swift/Controllers | |
| parent | b67aba2e28e5fd716c18bef9c2826b482ef832ad (diff) | |
| download | swift-3e40b302af0e2abde3c002c7f25ec5276f68f230.zip swift-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 'Swift/Controllers')
| -rw-r--r-- | Swift/Controllers/ShowProfileController.cpp | 9 | ||||
| -rw-r--r-- | Swift/Controllers/Storages/VCardFileStorage.cpp | 12 | ||||
| -rw-r--r-- | Swift/Controllers/Storages/VCardFileStorage.h | 4 |
3 files changed, 22 insertions, 3 deletions
diff --git a/Swift/Controllers/ShowProfileController.cpp b/Swift/Controllers/ShowProfileController.cpp index 15b7b26..d13e5a1 100644 --- a/Swift/Controllers/ShowProfileController.cpp +++ b/Swift/Controllers/ShowProfileController.cpp @@ -4,9 +4,16 @@ * See Documentation/Licenses/BSD-simplified.txt for more information. */ +/* + * Copyright (c) 2014 Kevin Smith and Remko Tronçon + * Licensed under the GNU General Public License v3. + * See Documentation/Licenses/GPLv3.txt for more information. + */ + #include "ShowProfileController.h" #include <boost/bind.hpp> +#include <boost/date_time/posix_time/posix_time.hpp> #include <Swiften/Base/foreach.h> #include <Swiften/VCards/VCardManager.h> @@ -44,7 +51,7 @@ void ShowProfileController::handleUIEvent(UIEvent::ref event) { newProfileWindow->setJID(showProfileEvent->getJID()); newProfileWindow->onWindowAboutToBeClosed.connect(boost::bind(&ShowProfileController::handleProfileWindowAboutToBeClosed, this, _1)); openedProfileWindows[showProfileEvent->getJID()] = newProfileWindow; - VCard::ref vcard = vcardManager->getVCardAndRequestWhenNeeded(showProfileEvent->getJID()); + VCard::ref vcard = vcardManager->getVCardAndRequestWhenNeeded(showProfileEvent->getJID(), boost::posix_time::minutes(5)); if (vcard) { newProfileWindow->setVCard(vcard); } else { diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp index b22e235..876d642 100644 --- a/Swift/Controllers/Storages/VCardFileStorage.cpp +++ b/Swift/Controllers/Storages/VCardFileStorage.cpp @@ -1,5 +1,5 @@ /* - * 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. */ @@ -58,7 +58,17 @@ boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const { return result; } +boost::posix_time::ptime VCardFileStorage::getVCardWriteTime(const JID& jid) const { + if (vcardWriteTimes.find(jid) == vcardWriteTimes.end()) { + return boost::posix_time::ptime(); + } + else { + return vcardWriteTimes.at(jid); + } +} + void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) { + vcardWriteTimes[jid] = boost::posix_time::second_clock::universal_time(); VCardPersister().savePayload(v, getVCardPath(jid)); getAndUpdatePhotoHash(jid, v); } diff --git a/Swift/Controllers/Storages/VCardFileStorage.h b/Swift/Controllers/Storages/VCardFileStorage.h index 2c3af3d..8ba001e 100644 --- a/Swift/Controllers/Storages/VCardFileStorage.h +++ b/Swift/Controllers/Storages/VCardFileStorage.h @@ -1,5 +1,5 @@ /* - * 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. */ @@ -21,6 +21,7 @@ namespace Swift { VCardFileStorage(boost::filesystem::path dir, CryptoProvider* crypto); virtual VCard::ref getVCard(const JID& jid) const; + virtual boost::posix_time::ptime getVCardWriteTime(const JID& jid) const; virtual void setVCard(const JID& jid, VCard::ref v); virtual std::string getPhotoHash(const JID&) const; @@ -37,5 +38,6 @@ namespace Swift { boost::filesystem::path cacheFile; typedef std::map<JID, std::string> PhotoHashMap; mutable PhotoHashMap photoHashes; + std::map<JID, boost::posix_time::ptime> vcardWriteTimes; }; } |