{
}
+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)
bool lastPart = !_requester->buffer(bufferId, msglist);
updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
if(lastPart) {
- stopBuffering();
+ dispatchMessages(_requester->bufferedMessages(), true);
+ _requester->flushBuffer();
}
} else {
dispatchMessages(msglist);
}
void ClientBacklogManager::requestInitialBacklog() {
- if(_requester) {
+ if(_requester && !_buffersRequested.isEmpty()) {
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->requestInitialBacklog();
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
BufferIdList newBuffers;
+ QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
foreach(BufferId bufferId, bufferIds) {
- if(!_buffersRequested.contains(bufferId))
- newBuffers << bufferId;
+ if(_buffersRequested.contains(bufferId) || !availableBuffers.contains(bufferId))
+ continue;
+ newBuffers << bufferId;
}
- _buffersRequested += bufferIds.toSet();
return newBuffers;
}
};
}
-void ClientBacklogManager::stopBuffering() {
- Q_ASSERT(_requester);
- dispatchMessages(_requester->bufferedMessages(), true);
-}
-
bool ClientBacklogManager::isBuffering() {
return _requester && _requester->isBuffering();
}