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/Storages/VCardFileStorage.cpp | |
| parent | b67aba2e28e5fd716c18bef9c2826b482ef832ad (diff) | |
| download | swift-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 'Swift/Controllers/Storages/VCardFileStorage.cpp')
| -rw-r--r-- | Swift/Controllers/Storages/VCardFileStorage.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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,96 +1,106 @@ /* - * 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 "Swift/Controllers/Storages/VCardFileStorage.h" #include <boost/filesystem/fstream.hpp> #include <boost/filesystem.hpp> #include <iostream> #include <Swiften/Entity/GenericPayloadPersister.h> #include <Swiften/Base/String.h> #include <Swiften/StringCodecs/Hexify.h> #include <Swiften/Base/foreach.h> #include <Swiften/Base/Path.h> #include <Swiften/Crypto/CryptoProvider.h> #include "Swiften/JID/JID.h" #include "Swiften/Elements/VCard.h" #include "Swiften/Serializer/PayloadSerializers/VCardSerializer.h" #include "Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h" #include "Swiften/Parser/PayloadParsers/VCardParser.h" using namespace Swift; typedef GenericPayloadPersister<VCard, VCardParser, VCardSerializer> VCardPersister; VCardFileStorage::VCardFileStorage(boost::filesystem::path dir, CryptoProvider* crypto) : VCardStorage(crypto), vcardsPath(dir), crypto(crypto) { cacheFile = vcardsPath / "phashes"; if (boost::filesystem::exists(cacheFile)) { try { boost::filesystem::ifstream file(cacheFile); std::string line; if (file.is_open()) { while (!file.eof()) { getline(file, line); std::pair<std::string, std::string> r = String::getSplittedAtFirst(line, ' '); JID jid(r.second); if (jid.isValid()) { photoHashes.insert(std::make_pair(jid, r.first)); } else if (!r.first.empty() || !r.second.empty()) { std::cerr << "Invalid entry in phashes file" << std::endl; } } } } catch (...) { std::cerr << "Error reading phashes file" << std::endl; } } } boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const { boost::shared_ptr<VCard> result = VCardPersister().loadPayloadGeneric(getVCardPath(jid)); getAndUpdatePhotoHash(jid, result); 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); } boost::filesystem::path VCardFileStorage::getVCardPath(const JID& jid) const { try { std::string file(jid.toString()); String::replaceAll(file, '/', "%2f"); return boost::filesystem::path(vcardsPath / stringToPath(file + ".xml")); } catch (const boost::filesystem::filesystem_error& e) { std::cerr << "ERROR: " << e.what() << std::endl; return boost::filesystem::path(); } } std::string VCardFileStorage::getPhotoHash(const JID& jid) const { PhotoHashMap::const_iterator i = photoHashes.find(jid); if (i != photoHashes.end()) { return i->second; } else { VCard::ref vCard = getVCard(jid); return getAndUpdatePhotoHash(jid, vCard); } } std::string VCardFileStorage::getAndUpdatePhotoHash(const JID& jid, VCard::ref vCard) const { std::string hash; if (vCard && !vCard->getPhoto().empty()) { hash = Hexify::hexify(crypto->getSHA1Hash(vCard->getPhoto())); } std::pair<PhotoHashMap::iterator, bool> r = photoHashes.insert(std::make_pair(jid, hash)); if (r.second) { savePhotoHashes(); |