X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=02fc8740e6b7e8b86257df72867c22dfd5a6cc99;hp=41701c3274c157962e9ee2c4191051fc37d45721;hb=3258b69cab16d7a5cf80a27d166c0a3628fe60d2;hpb=e178f81f44f5e305315f7755ca404c2a5f992711

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 41701c32..02fc8740 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -76,10 +76,7 @@ bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) {
       return false;
   }
 
-  MessageModelItem *item = createMessageModelItem(msg);
-  beginInsertRows(QModelIndex(), idx, idx);
-  _messageList.insert(idx, item);
-  endInsertRows();
+  insertMessageGroup(QList<Message>() << msg);
   return true;
 }
 
@@ -102,22 +99,40 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
 }
 
 void MessageModel::insertMessageGroup(const QList<Message> &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()) {
+  Q_ASSERT(!msglist.isEmpty()); // the msglist can be assumed to be non empty
+  int start = indexForId(msglist.first().msgId());
+  int end = start + msglist.count() - 1;
+  MessageModelItem *dayChangeItem = 0;
+  bool relocatedMsg = false;
+  if(start > 0) {
+    // check if the preceeding msg is a daychange message and if so if
+    // we have to drop or relocate it at the end of this chunk
+    int prevIdx = start - 1;
+    if(_messageList.at(prevIdx)->msgType() == Message::DayChange
+       && _messageList.at(prevIdx)->timeStamp() > msglist.at(0).timestamp()) {
       beginRemoveRows(QModelIndex(), prevIdx, prevIdx);
       MessageModelItem *oldItem = _messageList.takeAt(prevIdx);
+      if(msglist.last().timestamp() < oldItem->timeStamp()) {
+	// we have to reinsert it (with changed msgId -> thus we need to recreate it)
+	Message dayChangeMsg = Message::ChangeOfDay(oldItem->timeStamp());
+	dayChangeMsg.setMsgId(msglist.last().msgId());
+	dayChangeItem = createMessageModelItem(dayChangeMsg);
+      }
       delete oldItem;
       endRemoveRows();
-      idx--;
+      start--;
+      end--;
+      relocatedMsg = true;
     }
   }
-  Message dayChangeMsg;
-  bool needsDayChangeMsg = false;
-  if(idx < _messageList.count() && _messageList[idx]->msgType() != Message::DayChange) {
-    QDateTime nextTs = _messageList[idx]->timeStamp();
+
+  if(!dayChangeItem && start < _messageList.count()) {
+    // check if we need to insert a daychange message at the end of the this group
+
+    // if this assert triggers then indexForId() would have found a spot right before a DayChangeMsg
+    // this should never happen as daychange messages share the msgId with the preceeding message
+    Q_ASSERT(_messageList[start]->msgType() != Message::DayChange);
+    QDateTime nextTs = _messageList[start]->timeStamp();
     QDateTime prevTs = msglist.last().timestamp();
     nextTs.setTimeSpec(Qt::UTC);
     prevTs.setTimeSpec(Qt::UTC);
@@ -126,22 +141,38 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
     if(nextDay != prevDay) {
       nextTs.setTime_t(nextDay * 86400);
       nextTs.setTimeSpec(Qt::LocalTime);
-      dayChangeMsg = Message::ChangeOfDay(nextTs);
+      Message dayChangeMsg = Message::ChangeOfDay(nextTs);
       dayChangeMsg.setMsgId(msglist.last().msgId());
-      needsDayChangeMsg = true;
+      dayChangeItem = createMessageModelItem(dayChangeMsg);
     }
   }
-  int start = idx;
-  int end = idx + msglist.count() - 1;
+
+  if(dayChangeItem)
+    end++;
+
+  Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < msglist.first().msgId());
+
+  if(start < _messageList.count()) { // && _messageList[start]->msgId() <= msglist.last().msgId()) {
+    qDebug() << *(_messageList[start]) << "<=" << msglist.last();
+    qDebug() << start << end << msglist.count() << dayChangeItem << relocatedMsg;
+  }
+  Q_ASSERT(start == _messageList.count() || _messageList[start]->msgId() > msglist.last().msgId());
+
+
   beginInsertRows(QModelIndex(), start, end);
+  int pos = start;
   foreach(Message msg, msglist) {
-    _messageList.insert(idx, createMessageModelItem(msg));
-    idx++;
+    _messageList.insert(pos, createMessageModelItem(msg));
+    pos++;
   }
-  if(needsDayChangeMsg) {
-    _messageList.insert(idx, createMessageModelItem(dayChangeMsg));
+  if(dayChangeItem) {
+    _messageList.insert(pos, dayChangeItem);
+    pos++; // needed for the following assert
   }
   endInsertRows();
+  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);
 }
 
 int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
@@ -293,7 +324,6 @@ int MessageModel::indexForId(MsgId id) {
 
 void MessageModel::changeOfDay() {
   _dayChangeTimer.setInterval(86400000);
-  qDebug() << _nextDayChange;
   if(!_messageList.isEmpty()) {
     int idx = _messageList.count();
     while(idx > 0 && _messageList[idx - 1]->timeStamp() > _nextDayChange) {
@@ -350,3 +380,12 @@ bool MessageModelItem::operator==(const MessageModelItem &other) const {
 bool MessageModelItem::operator>(const MessageModelItem &other) const {
   return _msgId > other._msgId;
 }
+
+QDebug operator<<(QDebug dbg, const MessageModelItem &msgItem) {
+  dbg.nospace() << qPrintable(QString("MessageModelItem(MsgId:")) << msgItem.msgId()
+		<< qPrintable(QString(",")) << msgItem.timeStamp()
+		<< qPrintable(QString(", Type:")) << msgItem.msgType()
+		<< qPrintable(QString(", Flags:")) << msgItem.msgFlags() << qPrintable(QString(")"))
+		<< msgItem.data(1, Qt::DisplayRole).toString() << ":" << msgItem.data(2, Qt::DisplayRole).toString();
+  return dbg;
+}