X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.cpp;h=74126a14bd760d31b6a6e7a1ca1e31bb7a654598;hp=cf16d8d3b0713d80ace7ed54ca4bf8956c816d3e;hb=b134e777b822b929a78455fd92146bf7443e9aa1;hpb=8010224cf5bfe5685dc2cf535e8dc1ec19c4c364 diff --git a/src/common/buffersyncer.cpp b/src/common/buffersyncer.cpp index cf16d8d3..74126a14 100644 --- a/src/common/buffersyncer.cpp +++ b/src/common/buffersyncer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,48 +15,217 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "buffersyncer.h" -BufferSyncer::BufferSyncer(QObject *parent) : SyncableObject(parent) { +#include +BufferSyncer::BufferSyncer(QObject* parent) + : SyncableObject(parent) +{} +BufferSyncer::BufferSyncer(QHash lastMsg, + QHash lastSeenMsg, + QHash markerLines, + QHash activities, + QHash highlightCounts, + QObject* parent) + : SyncableObject(parent) + , _lastMsg(std::move(lastMsg)) + , _lastSeenMsg(std::move(lastSeenMsg)) + , _markerLines(std::move(markerLines)) + , _bufferActivities(std::move(activities)) + , _highlightCounts(std::move(highlightCounts)) +{} + +MsgId BufferSyncer::lastMsg(BufferId buffer) const +{ + return _lastMsg.value(buffer, MsgId()); +} + +MsgId BufferSyncer::lastSeenMsg(BufferId buffer) const +{ + return _lastSeenMsg.value(buffer, MsgId()); } +bool BufferSyncer::setLastSeenMsg(BufferId buffer, const MsgId& msgId) +{ + if (!msgId.isValid()) + return false; + + const MsgId oldLastSeenMsg = lastSeenMsg(buffer); + if (!oldLastSeenMsg.isValid() || oldLastSeenMsg < msgId) { + _lastSeenMsg[buffer] = msgId; + SYNC(ARG(buffer), ARG(msgId)) + emit lastSeenMsgSet(buffer, msgId); + return true; + } + return false; +} -QDateTime BufferSyncer::lastSeen(BufferId buffer) const { - if(_lastSeen.contains(buffer)) return _lastSeen[buffer]; - return QDateTime(); +MsgId BufferSyncer::markerLine(BufferId buffer) const +{ + return _markerLines.value(buffer, MsgId()); } -bool BufferSyncer::setLastSeen(BufferId buffer, const QDateTime &time) { - if(_lastSeen[buffer] < time) { - _lastSeen[buffer] = time; - emit lastSeenSet(buffer, time); +bool BufferSyncer::setMarkerLine(BufferId buffer, const MsgId& msgId) +{ + if (!msgId.isValid()) + return false; + + if (_markerLines.value(buffer) == msgId) + return false; + + _markerLines[buffer] = msgId; + SYNC(ARG(buffer), ARG(msgId)) + emit markerLineSet(buffer, msgId); return true; - } - return false; } -QVariantList BufferSyncer::initLastSeen() const { - QVariantList list; - foreach(BufferId id, _lastSeen.keys()) { - list << QVariant::fromValue(id) << _lastSeen[id]; - } - return list; +QVariantList BufferSyncer::initLastMsg() const +{ + QVariantList list; + QHash::const_iterator iter = _lastMsg.constBegin(); + while (iter != _lastMsg.constEnd()) { + list << QVariant::fromValue(iter.key()) << QVariant::fromValue(iter.value()); + ++iter; + } + return list; +} + +void BufferSyncer::initSetLastMsg(const QVariantList& list) +{ + _lastMsg.clear(); + Q_ASSERT(list.count() % 2 == 0); + for (int i = 0; i < list.count(); i += 2) { + setLastMsg(list.at(i).value(), list.at(i + 1).value()); + } +} + +QVariantList BufferSyncer::initLastSeenMsg() const +{ + QVariantList list; + QHash::const_iterator iter = _lastSeenMsg.constBegin(); + while (iter != _lastSeenMsg.constEnd()) { + list << QVariant::fromValue(iter.key()) << QVariant::fromValue(iter.value()); + ++iter; + } + return list; +} + +void BufferSyncer::initSetLastSeenMsg(const QVariantList& list) +{ + _lastSeenMsg.clear(); + Q_ASSERT(list.count() % 2 == 0); + for (int i = 0; i < list.count(); i += 2) { + setLastSeenMsg(list.at(i).value(), list.at(i + 1).value()); + } +} + +QVariantList BufferSyncer::initMarkerLines() const +{ + QVariantList list; + QHash::const_iterator iter = _markerLines.constBegin(); + while (iter != _markerLines.constEnd()) { + list << QVariant::fromValue(iter.key()) << QVariant::fromValue(iter.value()); + ++iter; + } + return list; } -void BufferSyncer::initSetLastSeen(const QVariantList &list) { - _lastSeen.clear(); - Q_ASSERT(list.count() % 2 == 0); - for(int i = 0; i < list.count(); i += 2) { - setLastSeen(list[i].value(), list[i+1].toDateTime()); - } +void BufferSyncer::initSetMarkerLines(const QVariantList& list) +{ + _markerLines.clear(); + Q_ASSERT(list.count() % 2 == 0); + for (int i = 0; i < list.count(); i += 2) { + setMarkerLine(list.at(i).value(), list.at(i + 1).value()); + } } -void BufferSyncer::requestSetLastSeen(BufferId buffer, const QDateTime &time) { - if(setLastSeen(buffer, time)) emit setLastSeenRequested(buffer, time); +QVariantList BufferSyncer::initActivities() const +{ + QVariantList list; + auto iter = _bufferActivities.constBegin(); + while (iter != _bufferActivities.constEnd()) { + list << QVariant::fromValue(iter.key()) << QVariant::fromValue((int)iter.value()); + ++iter; + } + return list; } +void BufferSyncer::initSetActivities(const QVariantList& list) +{ + _bufferActivities.clear(); + Q_ASSERT(list.count() % 2 == 0); + for (int i = 0; i < list.count(); i += 2) { + setBufferActivity(list.at(i).value(), list.at(i + 1).value()); + } +} + +Message::Types BufferSyncer::activity(BufferId buffer) const +{ + return _bufferActivities.value(buffer, Message::Types()); +} + +void BufferSyncer::removeBuffer(BufferId buffer) +{ + if (_lastMsg.contains(buffer)) + _lastMsg.remove(buffer); + if (_lastSeenMsg.contains(buffer)) + _lastSeenMsg.remove(buffer); + if (_markerLines.contains(buffer)) + _markerLines.remove(buffer); + if (_bufferActivities.contains(buffer)) + _bufferActivities.remove(buffer); + if (_highlightCounts.contains(buffer)) + _highlightCounts.remove(buffer); + SYNC(ARG(buffer)) + emit bufferRemoved(buffer); +} + +void BufferSyncer::mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) +{ + setLastMsg(buffer1, std::max(_lastMsg[buffer1], _lastMsg[buffer2])); + setBufferActivity(buffer1, _bufferActivities[buffer1] | _bufferActivities[buffer2]); + setHighlightCount(buffer1, _highlightCounts[buffer1] + _highlightCounts[buffer2]); + + if (_lastMsg.contains(buffer2)) + _lastMsg.remove(buffer2); + if (_lastSeenMsg.contains(buffer2)) + _lastSeenMsg.remove(buffer2); + if (_markerLines.contains(buffer2)) + _markerLines.remove(buffer2); + if (_bufferActivities.contains(buffer2)) + _bufferActivities.remove(buffer2); + if (_highlightCounts.contains(buffer2)) + _highlightCounts.remove(buffer2); + SYNC(ARG(buffer1), ARG(buffer2)) + emit buffersPermanentlyMerged(buffer1, buffer2); +} + +int BufferSyncer::highlightCount(BufferId buffer) const +{ + return _highlightCounts.value(buffer, 0); +} + +QVariantList BufferSyncer::initHighlightCounts() const +{ + QVariantList list; + auto iter = _highlightCounts.constBegin(); + while (iter != _highlightCounts.constEnd()) { + list << QVariant::fromValue(iter.key()) << QVariant::fromValue((int)iter.value()); + ++iter; + } + return list; +} + +void BufferSyncer::initSetHighlightCounts(const QVariantList& list) +{ + _highlightCounts.clear(); + Q_ASSERT(list.count() % 2 == 0); + for (int i = 0; i < list.count(); i += 2) { + setHighlightCount(list.at(i).value(), list.at(i + 1).value()); + } +}