X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientbacklogmanager.cpp;h=35403c0ed3d0d51ef4291b7658801dce30e86e5b;hp=476fa103ab4cf99bd3abc2863cd27d80f68bef2e;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=c230f7bd892b78b09710cf5746c2bf12a73d6b9b diff --git a/src/client/clientbacklogmanager.cpp b/src/client/clientbacklogmanager.cpp index 476fa103..35403c0e 100644 --- a/src/client/clientbacklogmanager.cpp +++ b/src/client/clientbacklogmanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,149 +15,168 @@ * 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 "clientbacklogmanager.h" +#include +#include + +#include + #include "abstractmessageprocessor.h" -#include "backlogsettings.h" #include "backlogrequester.h" +#include "backlogsettings.h" #include "client.h" +#include "util.h" -#include - -#include +ClientBacklogManager::ClientBacklogManager(QObject* parent) + : BacklogManager(parent) +{} -ClientBacklogManager::ClientBacklogManager(QObject *parent) - : BacklogManager(parent), - _requester(0) +QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional) { + _buffersRequested << bufferId; + return BacklogManager::requestBacklog(bufferId, first, last, limit, additional); } -QVariantList ClientBacklogManager::requestBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional) { - _buffersRequested << bufferId; - return BacklogManager::requestBacklog(bufferId, first, last, limit, additional); -} - -void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs) { - Q_UNUSED(first) Q_UNUSED(last) Q_UNUSED(limit) Q_UNUSED(additional) - - emit messagesReceived(bufferId, msgs.count()); - - MessageList msglist; - foreach(QVariant v, msgs) { - Message msg = v.value(); - msg.setFlags(msg.flags() | Message::Backlog); - msglist << msg; - } +void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId last, int limit, int additional, QVariantList msgs) +{ + Q_UNUSED(first) + Q_UNUSED(last) + Q_UNUSED(limit) + Q_UNUSED(additional) + + emit messagesReceived(bufferId, msgs.count()); + + MessageList msglist; + foreach (QVariant v, msgs) { + Message msg = v.value(); + msg.setFlags(msg.flags() | Message::Backlog); + msglist << msg; + } - if(isBuffering()) { - bool lastPart = !_requester->buffer(bufferId, msglist); - updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers()); - if(lastPart) { - stopBuffering(); + if (isBuffering()) { + bool lastPart = !_requester->buffer(bufferId, msglist); + updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers()); + if (lastPart) { + dispatchMessages(_requester->bufferedMessages(), true); + _requester->flushBuffer(); + } + } + else { + dispatchMessages(msglist); } - } else { - dispatchMessages(msglist); - } } -void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs) { - Q_UNUSED(first) Q_UNUSED(last) Q_UNUSED(limit) Q_UNUSED(additional) - - MessageList msglist; - foreach(QVariant v, msgs) { - Message msg = v.value(); - msg.setFlags(msg.flags() | Message::Backlog); - msglist << msg; - } +void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit, int additional, QVariantList msgs) +{ + Q_UNUSED(first) + Q_UNUSED(last) + Q_UNUSED(limit) + Q_UNUSED(additional) + + MessageList msglist; + foreach (QVariant v, msgs) { + Message msg = v.value(); + msg.setFlags(msg.flags() | Message::Backlog); + msglist << msg; + } - dispatchMessages(msglist); + dispatchMessages(msglist); } -void ClientBacklogManager::requestInitialBacklog() { - if(_requester && !_buffersRequested.isEmpty()) { - qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)"; - return; - } - - BacklogSettings settings; - switch(settings.requesterType()) { - case BacklogRequester::GlobalUnread: - _requester = new GlobalUnreadBacklogRequester(this); - break; - case BacklogRequester::PerBufferUnread: - _requester = new PerBufferUnreadBacklogRequester(this); - break; - case BacklogRequester::PerBufferFixed: - default: - _requester = new FixedBacklogRequester(this); - }; - - _requester->requestInitialBacklog(); - if(_requester->isBuffering()) { - updateProgress(0, _requester->totalBuffers()); - } -} +void ClientBacklogManager::requestInitialBacklog() +{ + if (_initBacklogRequested) { + Q_ASSERT(_requester); + qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)"; + return; + } -BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) { - BufferIdList newBuffers; - QSet availableBuffers = Client::networkModel()->allBufferIds().toSet(); - foreach(BufferId bufferId, bufferIds) { - if(_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId)) - continue; - newBuffers << bufferId; - } - return newBuffers; + BacklogSettings settings; + switch (settings.requesterType()) { + case BacklogRequester::GlobalUnread: + _requester = new GlobalUnreadBacklogRequester(this); + break; + case BacklogRequester::PerBufferUnread: + _requester = new PerBufferUnreadBacklogRequester(this); + break; + case BacklogRequester::PerBufferFixed: + default: + _requester = new FixedBacklogRequester(this); + }; + + _requester->requestInitialBacklog(); + _initBacklogRequested = true; + if (_requester->isBuffering()) { + updateProgress(0, _requester->totalBuffers()); + } } -void ClientBacklogManager::checkForBacklog(const QList &bufferIds) { - if(!_requester) { - // during client start up this message is to be expected in some situations. - qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester (yet?)."; - return; - } - switch(_requester->type()) { - case BacklogRequester::GlobalUnread: - break; - case BacklogRequester::PerBufferUnread: - case BacklogRequester::PerBufferFixed: - default: - { - BufferIdList buffers = filterNewBufferIds(bufferIds); - if(!buffers.isEmpty()) - _requester->requestBacklog(buffers); +BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList& bufferIds) +{ + BufferIdList newBuffers; + QSet availableBuffers = toQSet(Client::networkModel()->allBufferIds()); + foreach (BufferId bufferId, bufferIds) { + if (_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId)) + continue; + newBuffers << bufferId; } - }; + return newBuffers; } -void ClientBacklogManager::stopBuffering() { - Q_ASSERT(_requester); - dispatchMessages(_requester->bufferedMessages(), true); +void ClientBacklogManager::checkForBacklog(const QList& bufferIds) +{ + // we ingore all backlogrequests until we had our initial request + if (!_initBacklogRequested) { + return; + } + + if (!_requester) { + // during client start up this message is to be expected in some situations. + qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester."; + return; + } + switch (_requester->type()) { + case BacklogRequester::GlobalUnread: + break; + case BacklogRequester::PerBufferUnread: + case BacklogRequester::PerBufferFixed: + default: { + BufferIdList buffers = filterNewBufferIds(bufferIds); + if (!buffers.isEmpty()) + _requester->requestBacklog(buffers); + } + }; } -bool ClientBacklogManager::isBuffering() { - return _requester && _requester->isBuffering(); +bool ClientBacklogManager::isBuffering() +{ + return _requester && _requester->isBuffering(); } -void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool sort) { - if(messages.isEmpty()) - return; +void ClientBacklogManager::dispatchMessages(const MessageList& messages, bool sort) +{ + if (messages.isEmpty()) + return; - MessageList msgs = messages; + MessageList msgs = messages; - clock_t start_t = clock(); - if(sort) - qSort(msgs); - Client::messageProcessor()->process(msgs); - clock_t end_t = clock(); + clock_t start_t = clock(); + if (sort) + std::sort(msgs.begin(), msgs.end()); + Client::messageProcessor()->process(msgs); + clock_t end_t = clock(); - emit messagesProcessed(tr("Processed %1 messages in %2 seconds.").arg(messages.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC)); + emit messagesProcessed(tr("Processed %1 messages in %2 seconds.").arg(messages.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC)); } -void ClientBacklogManager::reset() { - delete _requester; - _requester = 0; - _buffersRequested.clear(); +void ClientBacklogManager::reset() +{ + delete _requester; + _requester = nullptr; + _initBacklogRequested = false; + _buffersRequested.clear(); }