X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=21e396534e1ee7d05ea88ab62bb45a4d49059fa0;hp=17e904957cd65597fb3b905975764e3f7e6da6c6;hb=3d0af34c02d84199ce680b3460151d02e0ef6d2e;hpb=aefcf3c3799a9deb286723eccc124760ce4d898d

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 17e90495..21e39653 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -22,87 +22,241 @@
 
 #include "message.h"
 
-MessageModel::MessageModel(QObject *parent) : QAbstractItemModel(parent) {
-  
-  
-  
-}
+#include <QEvent>
+
+class ProcessBufferEvent : public QEvent {
+public:
+  inline ProcessBufferEvent() : QEvent(QEvent::User) {}
+};
 
-MessageModel::~MessageModel() {
-  
-  
+MessageModel::MessageModel(QObject *parent)
+  : QAbstractItemModel(parent)
+{
 }
 
 QVariant MessageModel::data(const QModelIndex &index, int role) const {
-  int row = index.row();
-  if(row < 0 || row >= _messageList.count()) return QVariant();
+  int row = index.row(); int column = index.column();
+  if(row < 0 || row >= _messageList.count() || column < 0)
+    return QVariant();
+
+  if(role == ColumnTypeRole)
+    return column;
+
   return _messageList[row]->data(index.column(), role);
 }
 
 bool MessageModel::setData(const QModelIndex &index, const QVariant &value, int role) {
   int row = index.row();
-  if(row < 0 || row >= _messageList.count()) return false;
+  if(row < 0 || row >= _messageList.count())
+    return false;
+
   if(_messageList[row]->setData(index.column(), value, role)) {
     emit dataChanged(index, index);
     return true;
   }
+
   return false;
 }
 
-void MessageModel::insertMessage(const Message &msg) {
+
+
+bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) {
   MsgId id = msg.msgId();
   int idx = indexForId(id);
+  if(!fakeMsg && idx < _messageList.count()) { // check for duplicate
+    if(_messageList[idx]->msgId() == id)
+      return false;
+  }
+
   MessageModelItem *item = createMessageModelItem(msg);
   beginInsertRows(QModelIndex(), idx, idx);
   _messageList.insert(idx, item);
   endInsertRows();
+  return true;
 }
 
 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());
+  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)
+    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)
+	grouplist.prepend(*iter);
+      else
+	dupeCount++;
+    }
+  } else {
+    while(iter != msglist.constEnd()) {
+      if(!fastForward && (*iter).msgId() < id)
+	break;
+
+      if((*iter).msgId() != dupeId)
+	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() {
+  beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
+  qDeleteAll(_messageList);
+  _messageList.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[0]->data(0, MsgIdRole).value<MsgId>()) return 0;
+  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();
   // binary search
   int start = 0; int end = _messageList.count()-1;
   while(1) {
     if(end - start == 1) return end;
     int pivot = (end + start) / 2;
-    if(id <= _messageList[pivot]->data(0, MsgIdRole).value<MsgId>()) end = pivot;
+    if(id <= _messageList.value(pivot)->data(0, MsgIdRole).value<MsgId>()) end = pivot;
     else start = pivot;
   }
 }
 
 /**********************************************************************************/
 
-MessageModelItem::MessageModelItem(const Message &msg) {
-  _timestamp = msg.timestamp();
-  _msgId = msg.msgId();
-  _bufferId = msg.bufferInfo().bufferId();
-  _type = msg.type();
-  _flags = msg.flags();
+MessageModelItem::MessageModelItem(const Message &msg) :
+  _timestamp(msg.timestamp()),
+  _msgId(msg.msgId()),
+  _bufferId(msg.bufferInfo().bufferId()),
+  _type(msg.type()),
+  _flags(msg.flags())
+{
+}
 
+QVariant MessageModelItem::data(int column, int role) const {
+  if(column < MessageModel::TimestampColumn || column > MessageModel::ContentsColumn)
+    return QVariant();
+
+  switch(role) {
+  case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(_msgId);
+  case MessageModel::BufferIdRole: return QVariant::fromValue<BufferId>(_bufferId);
+  case MessageModel::TypeRole: return _type;
+  case MessageModel::FlagsRole: return (int)_flags;
+  case MessageModel::TimestampRole: return _timestamp;
+  default: return QVariant();
+  }
 }
 
-MessageModelItem::~MessageModelItem() {
 
+// Stuff for later
+bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
+  return (*m1) < (*m2);
 }
 
-QVariant MessageModelItem::data(int column, int role) const {
-  if(column < MessageModel::TimestampColumn || column > MessageModel::TextColumn) return QVariant();
-  switch(role) {
-    case MessageModel::MsgIdRole: return QVariant::fromValue<MsgId>(_msgId);
-    case MessageModel::BufferIdRole: return QVariant::fromValue<BufferId>(_bufferId);
-    case MessageModel::TypeRole: return _type;
-    case MessageModel::FlagsRole: return (int)_flags;
-    case MessageModel::TimestampRole: return _timestamp;
-    default: return QVariant();
-  }
+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;
+}