projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first version of richtext support for input widget - needs a lot of refactoring
[quassel.git]
/
src
/
client
/
clientbacklogmanager.cpp
diff --git
a/src/client/clientbacklogmanager.cpp
b/src/client/clientbacklogmanager.cpp
index
f88c606
..
f851b8c
100644
(file)
--- a/
src/client/clientbacklogmanager.cpp
+++ b/
src/client/clientbacklogmanager.cpp
@@
-29,12
+29,18
@@
#include <QDebug>
#include <QDebug>
+INIT_SYNCABLE_OBJECT(ClientBacklogManager)
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
_requester(0)
{
}
ClientBacklogManager::ClientBacklogManager(QObject *parent)
: BacklogManager(parent),
_requester(0)
{
}
+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
+57,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,8
+79,8
@@
void ClientBacklogManager::receiveBacklogAll(MsgId first, MsgId last, int limit,
}
void ClientBacklogManager::requestInitialBacklog() {
}
void ClientBacklogManager::requestInitialBacklog() {
- if(_requester) {
- qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
+ if(_requester
&& !_buffersRequested.isEmpty()
) {
+
//
qWarning() << "ClientBacklogManager::requestInitialBacklog() called twice in the same session! (Backlog has already been requested)";
return;
}
return;
}
@@
-90,7
+97,7
@@
void ClientBacklogManager::requestInitialBacklog() {
_requester = new FixedBacklogRequester(this);
};
_requester = new FixedBacklogRequester(this);
};
- _requester->requestBacklog();
+ _requester->request
Initial
Backlog();
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
if(_requester->isBuffering()) {
updateProgress(0, _requester->totalBuffers());
}
@@
-98,16
+105,21
@@
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) {
- 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;
switch(_requester->type()) {
case BacklogRequester::GlobalUnread:
break;
@@
-122,11
+134,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();
}