X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbacklogrequester.cpp;h=b26fe1725f58e3d624bc6bc35c1da05d69dc99cc;hb=8aa25a7c1526915741a7da989cc0a663bd84eb31;hp=9feaca43b140761835b6b8e0bb6e68ef3960bad8;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c;p=quassel.git

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index 9feaca43..b26fe172 100644
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -23,36 +23,54 @@
 #include <QObject>
 
 #include "backlogsettings.h"
+#include "bufferviewoverlay.h"
 #include "clientbacklogmanager.h"
 
-BacklogRequester::BacklogRequester(bool buffering, ClientBacklogManager *backlogManager)
+BacklogRequester::BacklogRequester(bool buffering, RequesterType requesterType, ClientBacklogManager *backlogManager)
   : backlogManager(backlogManager),
-    _isBuffering(buffering)
+    _isBuffering(buffering),
+    _requesterType(requesterType),
+    _totalBuffers(0)
 {
   Q_ASSERT(backlogManager);
 }
 
+void BacklogRequester::setWaitingBuffers(const QSet<BufferId> &buffers) {
+  _buffersWaiting = buffers;
+  _totalBuffers = _buffersWaiting.count();
+}
+
+void BacklogRequester::addWaitingBuffer(BufferId buffer) {
+  _buffersWaiting << buffer;
+  _totalBuffers++;
+}
+
 bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
   _bufferedMessages << messages;
   _buffersWaiting.remove(bufferId);
   return !_buffersWaiting.isEmpty();
 }
 
+BufferIdList BacklogRequester::allBufferIds() const {
+  QSet<BufferId> bufferIds = Client::bufferViewOverlay()->bufferIds();
+  bufferIds += Client::bufferViewOverlay()->tempRemovedBufferIds();
+  return bufferIds.toList();
+}
+
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
 FixedBacklogRequester::FixedBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(true, backlogManager)
+  : BacklogRequester(true, BacklogRequester::PerBufferFixed, backlogManager)
 {
   BacklogSettings backlogSettings;
   _backlogCount = backlogSettings.fixedBacklogAmount();
 }
 
-void FixedBacklogRequester::requestBacklog() {
-  QList<BufferId> allBuffers = allBufferIds();
-  setWaitingBuffers(allBuffers);
-  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 backlog messages for %2 buffers").arg(_backlogCount * allBuffers.count()).arg(allBuffers.count()));
-  foreach(BufferId bufferId, allBuffers) {
+void FixedBacklogRequester::requestBacklog(const BufferIdList &bufferIds) {
+  setWaitingBuffers(bufferIds);
+  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 backlog messages for %2 buffers").arg(_backlogCount * bufferIds.count()).arg(bufferIds.count()));
+  foreach(BufferId bufferId, bufferIds) {
     backlogManager->requestBacklog(bufferId, -1, -1, _backlogCount);
   }
 }
@@ -61,14 +79,14 @@ void FixedBacklogRequester::requestBacklog() {
 //  GLOBAL UNREAD BACKLOG REQUESTER
 // ========================================
 GlobalUnreadBacklogRequester::GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(false, backlogManager)
+  : BacklogRequester(false, BacklogRequester::GlobalUnread, backlogManager)
 {
   BacklogSettings backlogSettings;
   _limit = backlogSettings.globalUnreadBacklogLimit();
   _additional = backlogSettings.globalUnreadBacklogAdditional();
 }
 
-void GlobalUnreadBacklogRequester::requestBacklog() {
+void GlobalUnreadBacklogRequester::requestInitialBacklog() {
   MsgId oldestUnreadMessage;
   foreach(BufferId bufferId, allBufferIds()) {
     MsgId msgId = Client::networkModel()->lastSeenMsgId(bufferId);
@@ -83,18 +101,17 @@ void GlobalUnreadBacklogRequester::requestBacklog() {
 //  PER BUFFER UNREAD BACKLOG REQUESTER
 // ========================================
 PerBufferUnreadBacklogRequester::PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager)
-  : BacklogRequester(true, backlogManager)
+  : BacklogRequester(true, BacklogRequester::PerBufferUnread, backlogManager)
 {
   BacklogSettings backlogSettings;
   _limit = backlogSettings.perBufferUnreadBacklogLimit();
   _additional = backlogSettings.perBufferUnreadBacklogAdditional();
 }
 
-void PerBufferUnreadBacklogRequester::requestBacklog() {
-  QList<BufferId> allBuffers = allBufferIds();
-  setWaitingBuffers(allBuffers);
-  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 unread backlog messages for %2 buffers").arg((_limit + _additional) * allBuffers.count()).arg(allBuffers.count()));
-  foreach(BufferId bufferId, allBuffers) {
+void PerBufferUnreadBacklogRequester::requestBacklog(const BufferIdList &bufferIds) {
+  setWaitingBuffers(bufferIds);
+  backlogManager->emitMessagesRequested(QObject::tr("Requesting a total of up to %1 unread backlog messages for %2 buffers").arg((_limit + _additional) * bufferIds.count()).arg(bufferIds.count()));
+  foreach(BufferId bufferId, bufferIds) {
     backlogManager->requestBacklog(bufferId, Client::networkModel()->lastSeenMsgId(bufferId), -1, _limit, _additional);
   }
 }