X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbacklogrequester.cpp;h=a08227d82b15fb6f8a27b00363eb942725c31ba2;hp=c22b6b6db5811f82a21cc2c8a5b6e74da1beb5fd;hb=46d75f41de7c1aaee605c096da28d4b0d8abf138;hpb=332069a1830ed3a055ac6f2d7661bae1cc83e40c

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index c22b6b6d..a08227d8 100644
--- a/src/client/backlogrequester.cpp
+++ b/src/client/backlogrequester.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,26 +20,92 @@
 
 #include "backlogrequester.h"
 
-#include <QDebug>
+#include <QObject>
 
-#include "backlogmanager.h"
+#include "backlogsettings.h"
+#include "clientbacklogmanager.h"
 
-BacklogRequester::BacklogRequester(BacklogManager *backlogManager)
-  : backlogManager(backlogManager)
+BacklogRequester::BacklogRequester(bool buffering, ClientBacklogManager *backlogManager)
+  : backlogManager(backlogManager),
+    _isBuffering(buffering),
+    _totalBuffers(0)
 {
   Q_ASSERT(backlogManager);
 }
 
-// FIXED BACKLOG REQUESTER
-const int FixedBacklogRequester::backlogCount(500);
+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();
+}
 
-FixedBacklogRequester::FixedBacklogRequester(BacklogManager *backlogManager)
-  : BacklogRequester(backlogManager)
+// ========================================
+//  FIXED BACKLOG REQUESTER
+// ========================================
+FixedBacklogRequester::FixedBacklogRequester(ClientBacklogManager *backlogManager)
+  : BacklogRequester(true, 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) {
+    backlogManager->requestBacklog(bufferId, -1, -1, _backlogCount);
+  }
+}
+
+// ========================================
+//  GLOBAL UNREAD BACKLOG REQUESTER
+// ========================================
+GlobalUnreadBacklogRequester::GlobalUnreadBacklogRequester(ClientBacklogManager *backlogManager)
+  : BacklogRequester(false, backlogManager)
+{
+  BacklogSettings backlogSettings;
+  _limit = backlogSettings.globalUnreadBacklogLimit();
+  _additional = backlogSettings.globalUnreadBacklogAdditional();
+}
+
+void GlobalUnreadBacklogRequester::requestBacklog() {
+  MsgId oldestUnreadMessage;
   foreach(BufferId bufferId, allBufferIds()) {
-    backlogManager->requestBacklog(bufferId, backlogCount, -1);
+    MsgId msgId = Client::networkModel()->lastSeenMsgId(bufferId);
+    if(!oldestUnreadMessage.isValid() || oldestUnreadMessage > msgId)
+      oldestUnreadMessage = msgId;
+  }
+  backlogManager->emitMessagesRequested(QObject::tr("Requesting up to %1 of all unread backlog messages (plus additional %2)").arg(_limit).arg(_additional));
+  backlogManager->requestBacklogAll(oldestUnreadMessage, -1, _limit, _additional);
+}
+
+// ========================================
+//  PER BUFFER UNREAD BACKLOG REQUESTER
+// ========================================
+PerBufferUnreadBacklogRequester::PerBufferUnreadBacklogRequester(ClientBacklogManager *backlogManager)
+  : BacklogRequester(true, 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) {
+    backlogManager->requestBacklog(bufferId, Client::networkModel()->lastSeenMsgId(bufferId), -1, _limit, _additional);
   }
 }