X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=945ac7da26079d11b6bd44cc817cfd0f22e5da23;hp=09d8ddc87fb35daa2ccf20c97f4291a14074a26f;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=722557f44cb857b9467b84c87f742dce8e98a500 diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp index 09d8ddc8..945ac7da 100644 --- a/src/client/messagemodel.cpp +++ b/src/client/messagemodel.cpp @@ -20,10 +20,14 @@ #include "messagemodel.h" -#include "message.h" - #include +#include "backlogsettings.h" +#include "clientbacklogmanager.h" +#include "client.h" +#include "message.h" +#include "networkmodel.h" + class ProcessBufferEvent : public QEvent { public: inline ProcessBufferEvent() : QEvent(QEvent::User) {} @@ -66,8 +70,6 @@ bool MessageModel::setData(const QModelIndex &index, const QVariant &value, int return false; } - - bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) { MsgId id = msg.msgId(); int idx = indexForId(id); @@ -84,22 +86,29 @@ void MessageModel::insertMessages(const QList &msglist) { if(msglist.isEmpty()) return; - int processedMsgs = insertMessagesGracefully(msglist); - int remainingMsgs = msglist.count() - processedMsgs; - if(remainingMsgs > 0) { - if(msglist.first().msgId() < msglist.last().msgId()) { - // in Order - we have just successfully processed "processedMsg" messages from the end of the list - _messageBuffer << msglist.mid(0, remainingMsgs); - } else { - _messageBuffer << msglist.mid(processedMsgs); + if(_messageBuffer.isEmpty()) { + int processedMsgs = insertMessagesGracefully(msglist); + int remainingMsgs = msglist.count() - processedMsgs; + if(remainingMsgs > 0) { + if(msglist.first().msgId() < msglist.last().msgId()) { + // in Order - we have just successfully processed "processedMsg" messages from the end of the list + _messageBuffer = msglist.mid(0, remainingMsgs); + } else { + _messageBuffer = msglist.mid(processedMsgs); + } + qSort(_messageBuffer); + QCoreApplication::postEvent(this, new ProcessBufferEvent()); } + } else { + _messageBuffer << msglist; qSort(_messageBuffer); - QCoreApplication::postEvent(this, new ProcessBufferEvent()); } } void MessageModel::insertMessageGroup(const QList &msglist) { Q_ASSERT(!msglist.isEmpty()); // the msglist can be assumed to be non empty +// int last = msglist.count() - 1; +// Q_ASSERT(0 == last || msglist.at(0).msgId() != msglist.at(last).msgId() || msglist.at(last).type() == Message::DayChange); int start = indexForId(msglist.first().msgId()); int end = start + msglist.count() - 1; MessageModelItem *dayChangeItem = 0; @@ -163,6 +172,8 @@ void MessageModel::insertMessageGroup(const QList &msglist) { pos++; // needed for the following assert } endInsertRows(); + +// Q_ASSERT(start == end || _messageList.at(start)->msgId() != _messageList.at(end)->msgId() || _messageList.at(end)->msgType() == Message::DayChange); Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < _messageList[start]->msgId()); Q_ASSERT(end + 1 == _messageList.count() || _messageList[end]->msgId() < _messageList[end + 1]->msgId()); Q_ASSERT(pos - 1 == end); @@ -180,7 +191,7 @@ int MessageModel::insertMessagesGracefully(const QList &msglist) { // depending on the order we have to traverse from the front to the back or vice versa QList grouplist; - MsgId id; + MsgId minId; MsgId dupeId; int processedMsgs = 1; // we know the list isn't empty, so we at least process one message int idx; @@ -194,18 +205,20 @@ int MessageModel::insertMessagesGracefully(const QList &msglist) { } idx = indexForId((*iter).msgId()); - if(idx >= 0 && !_messageList.isEmpty()) + if(idx < _messageList.count()) dupeId = _messageList[idx]->msgId(); // we always compare to the previous entry... // if there isn't, we can fastforward to the top if(idx - 1 >= 0) - id = _messageList[idx - 1]->msgId(); + minId = _messageList[idx - 1]->msgId(); else fastForward = true; - if((*iter).msgId() != dupeId) + if((*iter).msgId() != dupeId) { grouplist << *iter; + dupeId = (*iter).msgId(); + } if(!inOrder) iter++; @@ -214,7 +227,7 @@ int MessageModel::insertMessagesGracefully(const QList &msglist) { while(iter != msglist.constBegin()) { iter--; - if(!fastForward && (*iter).msgId() < id) + if(!fastForward && (*iter).msgId() < minId) break; processedMsgs++; @@ -245,7 +258,7 @@ int MessageModel::insertMessagesGracefully(const QList &msglist) { } } else { while(iter != msglist.constEnd()) { - if(!fastForward && (*iter).msgId() < id) + if(!fastForward && (*iter).msgId() < minId) break; processedMsgs++; @@ -277,7 +290,8 @@ int MessageModel::insertMessagesGracefully(const QList &msglist) { } } - insertMessageGroup(grouplist); + if(!grouplist.isEmpty()) + insertMessageGroup(grouplist); return processedMsgs; } @@ -296,7 +310,6 @@ void MessageModel::customEvent(QEvent *event) { QList::iterator removeStart = _messageBuffer.begin() + remainingMsgs; QList::iterator removeEnd = _messageBuffer.end(); _messageBuffer.erase(removeStart, removeEnd); - if(!_messageBuffer.isEmpty()) QCoreApplication::postEvent(this, new ProcessBufferEvent()); } @@ -306,10 +319,9 @@ void MessageModel::clear() { qDeleteAll(_messageList); _messageList.clear(); endRemoveRows(); + _messagesWaiting.clear(); } - - // returns index of msg with given Id or of the next message after that (i.e., the index where we'd insert this msg) int MessageModel::indexForId(MsgId id) { if(_messageList.isEmpty() || id <= _messageList.value(0)->msgId()) @@ -344,8 +356,48 @@ void MessageModel::changeOfDay() { _nextDayChange = _nextDayChange.addSecs(86400); } -/**********************************************************************************/ +void MessageModel::requestBacklog(BufferId bufferId) { + if(_messagesWaiting.contains(bufferId)) + return; + BacklogSettings backlogSettings; + int requestCount = backlogSettings.dynamicBacklogAmount(); + + for(int i = 0; i < _messageList.count(); i++) { + if(_messageList.at(i)->bufferId() == bufferId) { + _messagesWaiting[bufferId] = requestCount; + Client::backlogManager()->emitMessagesRequested(tr("Requesting %1 messages from backlog for buffer %2:%3") + .arg(requestCount) + .arg(Client::networkModel()->networkName(bufferId)) + .arg(Client::networkModel()->bufferName(bufferId))); + Client::backlogManager()->requestBacklog(bufferId, -1, _messageList.at(i)->msgId(), requestCount); + return; + } + } +} + +void MessageModel::messagesReceived(BufferId bufferId, int count) { + if(!_messagesWaiting.contains(bufferId)) + return; + + _messagesWaiting[bufferId] -= count; + if(_messagesWaiting[bufferId] <= 0) + _messagesWaiting.remove(bufferId); +} + +void MessageModel::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2) { + for(int i = 0; i < _messageList.count(); i++) { + if(_messageList[i]->bufferId() == bufferId2) { + _messageList[i]->setBufferId(bufferId1); + QModelIndex idx = index(i, 0); + emit dataChanged(idx, idx); + } + } +} + +// ======================================== +// MessageModelItem +// ======================================== MessageModelItem::MessageModelItem(const Message &msg) : _timestamp(msg.timestamp()), _msgId(msg.msgId()), @@ -353,6 +405,8 @@ MessageModelItem::MessageModelItem(const Message &msg) : _type(msg.type()), _flags(msg.flags()) { + if(!msg.sender().contains('!')) + _flags |= Message::ServerMsg; } QVariant MessageModelItem::data(int column, int role) const { @@ -365,10 +419,22 @@ QVariant MessageModelItem::data(int column, int role) const { case MessageModel::TypeRole: return _type; case MessageModel::FlagsRole: return (int)_flags; case MessageModel::TimestampRole: return _timestamp; + case MessageModel::RedirectedToRole: return qVariantFromValue(_redirectedTo); default: return QVariant(); } } +bool MessageModelItem::setData(int column, const QVariant &value, int role) { + Q_UNUSED(column); + + switch(role) { + case MessageModel::RedirectedToRole: + _redirectedTo = value.value(); + return true; + default: + return false; + } +} // Stuff for later bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){