X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=5269d0ad3b30b9910a5ca0850eeb4f673d785236;hp=245a787090f4828be72445ca44ea05e63d343115;hb=46ddb293c61aeb90295fa1a14be71e8896f34ade;hpb=ea372dac8dda146255c7232922904e9f90a0d7f9 diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp index 245a7870..5269d0ad 100644 --- a/src/client/messagemodel.cpp +++ b/src/client/messagemodel.cpp @@ -22,6 +22,13 @@ #include "message.h" +#include + +class ProcessBufferEvent : public QEvent { +public: + inline ProcessBufferEvent() : QEvent(QEvent::User) {} +}; + MessageModel::MessageModel(QObject *parent) : QAbstractItemModel(parent) { @@ -68,57 +75,57 @@ bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) { return true; } +void MessageModel::insertMessages(const QList &msglist) { + if(msglist.isEmpty()) + return; -void MessageModel::insertMessageGroup(const QList &msglist) { - if(msglist.isEmpty()) return; +// if(_messageList.isEmpty()) { +// insertMessageGroup(msglist); +// } else { + int processedMsgs = insertMessagesGracefully(msglist); + int remainingMsgs = msglist.count() - processedMsgs; + if(remainingMsgs > 0) { + if(msglist.first().msgId() < msglist.last().msgId()) { + // in Order + _messageBuffer << msglist.mid(0, remainingMsgs); + } else { + _messageBuffer << msglist.mid(processedMsgs); + } + qSort(_messageBuffer); + QCoreApplication::postEvent(this, new ProcessBufferEvent()); + } +// } +} +void MessageModel::insertMessageGroup(const QList &msglist) { int idx = indexForId(msglist.first().msgId()); + if(idx > 0) { + int prevIdx = idx - 1; + if(_messageList[prevIdx]->msgType() == Message::DayChange + && _messageList[prevIdx]->timeStamp() > msglist.value(0).timestamp()) { + beginRemoveRows(QModelIndex(), prevIdx, prevIdx); + MessageModelItem *oldItem = _messageList.takeAt(prevIdx); + delete oldItem; + endRemoveRows(); + idx--; + } + } beginInsertRows(QModelIndex(), idx, idx+msglist.count()-1); - foreach(Message msg, msglist) { _messageList.insert(idx, createMessageModelItem(msg)); idx++; } - endInsertRows(); } - -void MessageModel::insertMessages(const QList &msglist) { - if(msglist.isEmpty()) - return; - - if(_messageList.isEmpty()) { - insertMessageGroup(msglist); - return; - } - +int MessageModel::insertMessagesGracefully(const QList &msglist) { bool inOrder = (msglist.first().msgId() < msglist.last().msgId()); - - // check if the whole bunch fits in at one position - if(indexForId(msglist.first().msgId()) == indexForId(msglist.last().msgId())) { - if(inOrder) { - insertMessageGroup(msglist); - } else { - QList messages = msglist; - qSort(messages); - insertMessageGroup(messages); - } - return; - } - // depending on the order we have to traverse from the front to the back or vice versa - // for the sake of performance we have a little code duplication here - // if you need to do some changes here you'll probably need to change them at all - // places marked DUPE - - // FIXME: keep scrollbars from jumping - // the somewhat bulk insert leads to a jumpy scrollbar when the user requests further backlog. - // it would probably be the best to stop processing each time we actually insert a messagegroup - // and give back controll to the eventloop (similar to what the QtUiMessageProcessor used to do) QList grouplist; MsgId id; + MsgId dupeId; + int dupeCount = 0; bool fastForward = false; QList::const_iterator iter; if(inOrder) { @@ -128,15 +135,21 @@ void MessageModel::insertMessages(const QList &msglist) { iter = msglist.constBegin(); } - // DUPE (1 / 3) int idx = indexForId((*iter).msgId()); + if(idx >= 0 && !_messageList.isEmpty()) + 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) // also safe as we've passed another empty check + if(idx - 1 >= 0) id = _messageList[idx - 1]->msgId(); else fastForward = true; - grouplist << *iter; + + if((*iter).msgId() != dupeId) + grouplist << *iter; + else + dupeCount++; if(!inOrder) iter++; @@ -144,46 +157,73 @@ void MessageModel::insertMessages(const QList &msglist) { if(inOrder) { while(iter != msglist.constBegin()) { iter--; - // DUPE (2 / 3) - if(!fastForward && (*iter).msgId() < id) { - insertMessageGroup(grouplist); - grouplist.clear(); - - // build new group - int idx = indexForId((*iter).msgId()); - if(idx - 1 >= 0) - id = _messageList[idx - 1]->msgId(); - else - fastForward = true; + + if(!fastForward && (*iter).msgId() < id) + break; + + if((*iter).msgId() != dupeId) { + if(!grouplist.isEmpty()) { + QDateTime nextTs = grouplist.value(0).timestamp(); + QDateTime prevTs = (*iter).timestamp(); + nextTs.setTimeSpec(Qt::UTC); + prevTs.setTimeSpec(Qt::UTC); + uint nextDay = nextTs.toTime_t() / 86400; + uint prevDay = prevTs.toTime_t() / 86400; + if(nextDay != prevDay) { + nextTs.setTime_t(nextDay * 86400); + nextTs.setTimeSpec(Qt::LocalTime); + Message dayChangeMsg = Message::ChangeOfDay(nextTs); + dayChangeMsg.setMsgId((*iter).msgId()); + grouplist.prepend(dayChangeMsg); + dupeCount--; + } + } + grouplist.prepend(*iter); + } else { + dupeCount++; } - grouplist.prepend(*iter); } } else { while(iter != msglist.constEnd()) { - // DUPE (3 / 3) - if(!fastForward && (*iter).msgId() < id) { - insertMessageGroup(grouplist); - grouplist.clear(); - - // build new group - int idx = indexForId((*iter).msgId()); - if(idx - 1 >= 0) - id = _messageList[idx - 1]->msgId(); - else - fastForward = true; + if(!fastForward && (*iter).msgId() < id) + break; + + if((*iter).msgId() != dupeId) { + if(!grouplist.isEmpty()) { + qWarning() << "copy day change check"; + } + grouplist.prepend(*iter); + } else { + dupeCount++; } - grouplist.prepend(*iter); + iter++; } } - if(!grouplist.isEmpty()) { - insertMessageGroup(grouplist); - } - - return; + insertMessageGroup(grouplist); + return grouplist.count() + dupeCount; } +void MessageModel::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; + + event->accept(); + + if(_messageBuffer.isEmpty()) + return; + + int processedMsgs = insertMessagesGracefully(_messageBuffer); + int remainingMsgs = _messageBuffer.count() - processedMsgs; + + QList::iterator removeStart = _messageBuffer.begin() + remainingMsgs; + QList::iterator removeEnd = _messageBuffer.end(); + _messageBuffer.erase(removeStart, removeEnd); + + if(!_messageBuffer.isEmpty()) + QCoreApplication::postEvent(this, new ProcessBufferEvent()); +} void MessageModel::clear() { beginRemoveRows(QModelIndex(), 0, rowCount() - 1); @@ -193,16 +233,21 @@ void MessageModel::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)->data(0, MsgIdRole).value()) return 0; - if(id > _messageList.last()->data(0, MsgIdRole).value()) return _messageList.count(); + if(_messageList.isEmpty() || id <= _messageList.value(0)->msgId()) + return 0; + if(id > _messageList.last()->msgId()) + return _messageList.count(); + // binary search int start = 0; int end = _messageList.count()-1; while(1) { - if(end - start == 1) return end; + if(end - start == 1) + return end; int pivot = (end + start) / 2; - if(id <= _messageList.value(pivot)->data(0, MsgIdRole).value()) end = pivot; + if(id <= _messageList.value(pivot)->msgId()) end = pivot; else start = pivot; } } @@ -234,7 +279,7 @@ QVariant MessageModelItem::data(int column, int role) const { // Stuff for later -bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){ +bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){ return (*m1) < (*m2); }