/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
}
if(isBuffering()) {
- if(!_requester->buffer(bufferId, msglist)) {
- // this was the last part to buffer
+ bool lastPart = !_requester->buffer(bufferId, msglist);
+ updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
+ if(lastPart) {
stopBuffering();
- reset();
}
} else {
dispatchMessages(msglist);
}
dispatchMessages(msglist);
- reset();
}
void ClientBacklogManager::requestInitialBacklog() {
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->requestInitialBacklog();
+ if(_requester->isBuffering()) {
+ updateProgress(0, _requester->totalBuffers());
+ }
+}
+
+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) {
+ 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::PerBufferUnread:
+ case BacklogRequester::PerBufferFixed:
+ default:
+ {
+ BufferIdList buffers = filterNewBufferIds(bufferIds);
+ if(!buffers.isEmpty())
+ _requester->requestBacklog(buffers);
+ }
+ };
}
void ClientBacklogManager::stopBuffering() {
Q_ASSERT(_requester);
-
dispatchMessages(_requester->bufferedMessages(), true);
}
}
void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool sort) {
+ if(messages.isEmpty())
+ return;
+
MessageList msgs = messages;
clock_t start_t = clock();
Client::messageProcessor()->process(msgs);
clock_t end_t = clock();
- emit messagesProcessed(tr("Processed %1 messages in %2 seconds.").arg(msgs.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC));
+ emit messagesProcessed(tr("Processed %1 messages in %2 seconds.").arg(messages.count()).arg((float)(end_t - start_t) / CLOCKS_PER_SEC));
}
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
+ _buffersRequested.clear();
}