projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce the concept of an "active" bufferview
[quassel.git]
/
src
/
client
/
clientbacklogmanager.cpp
diff --git
a/src/client/clientbacklogmanager.cpp
b/src/client/clientbacklogmanager.cpp
index
2b2c586
..
8b6e2e4
100644
(file)
--- a/
src/client/clientbacklogmanager.cpp
+++ b/
src/client/clientbacklogmanager.cpp
@@
-29,12
+29,19
@@
#include <QDebug>
#include <QDebug>
+INIT_SYNCABLE_OBJECT(ClientBacklogManager)
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
- _requester(0)
+ _requester(0),
+ _initBacklogRequested(false)
{
}
{
}
+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)
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)
@@
-51,7
+58,8
@@
void ClientBacklogManager::receiveBacklog(BufferId bufferId, MsgId first, MsgId
bool lastPart = !_requester->buffer(bufferId, msglist);
updateProgress(_requester->totalBuffers() - _requester->buffersWaiting(), _requester->totalBuffers());
if(lastPart) {
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);
}
} else {
dispatchMessages(msglist);
@@
-72,7
+80,8
@@
void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit,
}
void ClientBacklogManager::requestInitialBacklog() {
}
void ClientBacklogManager::requestInitialBacklog() {
- if(_requester) {
+ if(_initBacklogRequested) {
+ Q_ASSERT(_requester);
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
@@
-91,6
+100,7
@@
void ClientBacklogManager::requestInitialBacklog() {
};
_requester->requestInitialBacklog();
};
_requester->requestInitialBacklog();
+ _initBacklogRequested = true;
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
@@
-98,18
+108,24
@@
void ClientBacklogManager::requestInitialBacklog() {
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
BufferIdList newBuffers;
BufferIdList ClientBacklogManager::filterNewBufferIds(const BufferIdList &bufferIds) {
BufferIdList newBuffers;
+ QSet<BufferId> availableBuffers = Client::networkModel()->allBufferIds().toSet();
foreach(BufferId bufferId, bufferIds) {
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::checkForBacklog(const QList<BufferId> &bufferIds) {
return newBuffers;
}
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
+ // we ingore all backlogrequests until we had our initial request
+ if(!_initBacklogRequested) {
+ return;
+ }
+
if(!_requester) {
// during client start up this message is to be expected in some situations.
if(!_requester) {
// during client start up this message is to be expected in some situations.
- qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester
(yet?)
.";
+ qDebug() << "ClientBacklogManager::checkForBacklog(): no active backlog requester.";
return;
}
switch(_requester->type()) {
return;
}
switch(_requester->type()) {
@@
-126,11
+142,6
@@
void ClientBacklogManager::checkForBacklog(const QList<BufferId> &bufferIds) {
};
}
};
}
-void ClientBacklogManager::stopBuffering() {
- Q_ASSERT(_requester);
- dispatchMessages(_requester->bufferedMessages(), true);
-}
-
bool ClientBacklogManager::isBuffering() {
return _requester && _requester->isBuffering();
}
bool ClientBacklogManager::isBuffering() {
return _requester && _requester->isBuffering();
}
@@
-153,5
+164,6
@@
void ClientBacklogManager::dispatchMessages(const MessageList &messages, bool so
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
void ClientBacklogManager::reset() {
delete _requester;
_requester = 0;
+ _initBacklogRequested = false;
_buffersRequested.clear();
}
_buffersRequested.clear();
}