X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=5269d0ad3b30b9910a5ca0850eeb4f673d785236;hp=940dda2016e44dfbc80169893bb7942f93ad5f5e;hb=46ddb293c61aeb90295fa1a14be71e8896f34ade;hpb=756158351d58ce25857f52589f5f8c42236a1c27

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 940dda20..5269d0ad 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -22,6 +22,13 @@
 
 #include "message.h"
 
+#include <QEvent>
+
+class ProcessBufferEvent : public QEvent {
+public:
+  inline ProcessBufferEvent() : QEvent(QEvent::User) {}
+};
+
 MessageModel::MessageModel(QObject *parent)
   : QAbstractItemModel(parent)
 {
@@ -51,6 +58,8 @@ 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);
@@ -67,10 +76,153 @@ bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) {
 }
 
 void MessageModel::insertMessages(const QList<Message> &msglist) {
-  if(msglist.isEmpty()) return;
-  // FIXME make this more efficient by grouping msgs
-  foreach(Message msg, msglist)
-    insertMessage(msg);
+  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<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()) {
+      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();
+}
+
+int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
+  bool inOrder = (msglist.first().msgId() < msglist.last().msgId());
+  // depending on the order we have to traverse from the front to the back or vice versa
+
+  QList<Message> grouplist;
+  MsgId id;
+  MsgId dupeId;
+  int dupeCount = 0;
+  bool fastForward = false;
+  QList<Message>::const_iterator iter;
+  if(inOrder) {
+    iter = msglist.constEnd();
+    iter--; // this op is safe as we've allready passed an empty check
+  } else {
+    iter = msglist.constBegin();
+  }
+
+  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)
+    id = _messageList[idx - 1]->msgId();
+  else
+    fastForward = true;
+
+  if((*iter).msgId() != dupeId)
+    grouplist << *iter;
+  else
+    dupeCount++;
+
+  if(!inOrder)
+    iter++;
+
+  if(inOrder) {
+    while(iter != msglist.constBegin()) {
+      iter--;
+
+      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++;
+      }
+    }
+  } else {
+    while(iter != msglist.constEnd()) {
+      if(!fastForward && (*iter).msgId() < id)
+	break;
+
+      if((*iter).msgId() != dupeId) {
+	if(!grouplist.isEmpty()) {
+	  qWarning() << "copy day change check";
+	}
+	grouplist.prepend(*iter);
+      } else {
+	dupeCount++;
+      }
+
+      iter++;
+    }
+  }
+
+  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<Message>::iterator removeStart = _messageBuffer.begin() + remainingMsgs;
+  QList<Message>::iterator removeEnd = _messageBuffer.end();
+  _messageBuffer.erase(removeStart, removeEnd);
+
+  if(!_messageBuffer.isEmpty())
+    QCoreApplication::postEvent(this, new ProcessBufferEvent());
 }
 
 void MessageModel::clear() {
@@ -80,16 +232,22 @@ void MessageModel::clear() {
   endRemoveRows();
 }
 
+
+
 // 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<MsgId>()) return 0;
-  if(id > _messageList.last()->data(0, MsgIdRole).value<MsgId>()) 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<MsgId>()) end = pivot;
+    if(id <= _messageList.value(pivot)->msgId()) end = pivot;
     else start = pivot;
   }
 }
@@ -119,3 +277,20 @@ QVariant MessageModelItem::data(int column, int role) const {
   }
 }
 
+
+// Stuff for later
+bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
+  return (*m1) < (*m2);
+}
+
+bool MessageModelItem::operator<(const MessageModelItem &other) const {
+  return _msgId < other._msgId;
+}
+
+bool MessageModelItem::operator==(const MessageModelItem &other) const {
+  return _msgId == other._msgId;
+}
+
+bool MessageModelItem::operator>(const MessageModelItem &other) const {
+  return _msgId > other._msgId;
+}