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

diff --git a/src/client/backlogrequester.cpp b/src/client/backlogrequester.cpp
index 8b53cf32..9feaca43 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,11 +20,12 @@
 
 #include "backlogrequester.h"
 
-#include <QDebug>
+#include <QObject>
 
-#include "backlogmanager.h"
+#include "backlogsettings.h"
+#include "clientbacklogmanager.h"
 
-BacklogRequester::BacklogRequester(bool buffering, BacklogManager *backlogManager)
+BacklogRequester::BacklogRequester(bool buffering, ClientBacklogManager *backlogManager)
   : backlogManager(backlogManager),
     _isBuffering(buffering)
 {
@@ -40,16 +41,60 @@ bool BacklogRequester::buffer(BufferId bufferId, const MessageList &messages) {
 // ========================================
 //  FIXED BACKLOG REQUESTER
 // ========================================
-FixedBacklogRequester::FixedBacklogRequester(BacklogManager *backlogManager)
-  : BacklogRequester(true, backlogManager),
-    _backlogCount(500)
+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, _backlogCount, -1);
+    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()) {
+    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);
   }
 }