msglist << msg;
}
- _backlogReceived << bufferId;
-
if(isBuffering()) {
bool lastPart = !_requester->buffer(bufferId, msglist);
updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->requestInitialBacklog();
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
}
-void ClientBacklogManager::checkForBacklog(const BufferId bufferId) {
- if(_backlogReceived.contains(bufferId))
- return;
-
- QList<BufferId> bufferIds;
- bufferIds << bufferId;
- checkForBacklog(bufferIds);
+BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
+ BufferIdList newBuffers;
+ foreach(BufferId bufferId, bufferIds) {
+ if(!_buffersRequested.contains(bufferId))
+ newBuffers << bufferId;
+ }
+ _buffersRequested += bufferIds.toSet();
+ return newBuffers;
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
- Q_ASSERT(_requester);
+ 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::PerBufferFixed:
default:
{
- QList<BufferId> buffers;
- foreach(BufferId bufferId, bufferIds)
- if(!_backlogReceived.contains(bufferId))
- buffers << bufferId;
- _requester->requestBacklog(buffers);
+ BufferIdList buffers = filterNewBufferIds(bufferIds);
+ if(!buffers.isEmpty())
+ _requester->requestBacklog(buffers);
}
};
}
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
- _backlogReceived.clear();
+ _buffersRequested.clear();
}