X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=945ac7da26079d11b6bd44cc817cfd0f22e5da23;hp=28872dc7edac30cba7af997c0d2bfa8e2e20d458;hb=3c2914faeb01f3bc32e29f40179ae88040fbcf59;hpb=22128f214112de5e4f3111e0a90f7d5d99e82dac

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 28872dc7..945ac7da 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -20,10 +20,14 @@
 
 #include "messagemodel.h"
 
-#include "message.h"
-
 #include <QEvent>
 
+#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,31 +86,39 @@ void MessageModel::insertMessages(const QList<Message> &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
-      _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<Message> &msglist) {
-  // the msglist can be assumed to be non empty
-  int idx = indexForId(msglist.first().msgId());
-  int start = idx;
-  int end = idx + msglist.count() - 1;
+  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;
-
-  if(idx > 0) {
-    int prevIdx = idx - 1;
-    if(_messageList[prevIdx]->msgType() == Message::DayChange
-       && _messageList[prevIdx]->timeStamp() > msglist.value(0).timestamp()) {
+  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()) {
@@ -119,12 +129,19 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
       }
       delete oldItem;
       endRemoveRows();
-      idx--;
+      start--;
+      end--;
+      relocatedMsg = true;
     }
   }
 
-  if(!dayChangeItem && 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);
@@ -142,25 +159,42 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
   if(dayChangeItem)
     end++;
 
+  Q_ASSERT(start == 0 || _messageList[start - 1]->msgId() < msglist.first().msgId());
+  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(dayChangeItem) {
-    _messageList.insert(idx, dayChangeItem);
+    _messageList.insert(pos, dayChangeItem);
+    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);
 }
 
 int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
+  /* short description:
+   * 1) first we check where the message with the highest msgId from msglist would be inserted
+   * 2) check that position for dupe
+   * 3) determine the messageId of the preceeding msg
+   * 4) insert as many msgs from msglist with with msgId larger then the just determined id
+   *    those messages are automatically less then the msg of the position we just determined in 1)
+   */
   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 minId;
   MsgId dupeId;
-  int dupeCount = 0;
+  int processedMsgs = 1; // we know the list isn't empty, so we at least process one message
+  int idx;
   bool fastForward = false;
   QList<Message>::const_iterator iter;
   if(inOrder) {
@@ -170,21 +204,21 @@ int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
     iter = msglist.constBegin();
   }
 
-  int idx = indexForId((*iter).msgId());
-  if(idx >= 0 && !_messageList.isEmpty())
+  idx = indexForId((*iter).msgId());
+  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;
-  else
-    dupeCount++;
+    dupeId = (*iter).msgId();
+  }
 
   if(!inOrder)
     iter++;
@@ -193,9 +227,15 @@ int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
     while(iter != msglist.constBegin()) {
       iter--;
 
-      if(!fastForward && (*iter).msgId() < id)
+      if(!fastForward && (*iter).msgId() < minId)
 	break;
+      processedMsgs++;
 
+      if(grouplist.isEmpty()) { // as long as we don't have a starting point, we have to update the dupeId
+	idx = indexForId((*iter).msgId());
+	if(idx >= 0 && !_messageList.isEmpty())
+	  dupeId = _messageList[idx]->msgId();
+      }
       if((*iter).msgId() != dupeId) {
 	if(!grouplist.isEmpty()) {
 	  QDateTime nextTs = grouplist.value(0).timestamp();
@@ -210,19 +250,23 @@ int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
 	    Message dayChangeMsg = Message::ChangeOfDay(nextTs);
 	    dayChangeMsg.setMsgId((*iter).msgId());
 	    grouplist.prepend(dayChangeMsg);
-	    dupeCount--;
 	  }
 	}
+	dupeId = (*iter).msgId();
 	grouplist.prepend(*iter);
-      } else {
-	dupeCount++;
       }
     }
   } else {
     while(iter != msglist.constEnd()) {
-      if(!fastForward && (*iter).msgId() < id)
+      if(!fastForward && (*iter).msgId() < minId)
 	break;
+      processedMsgs++;
 
+      if(grouplist.isEmpty()) { // as long as we don't have a starting point, we have to update the dupeId
+	idx = indexForId((*iter).msgId());
+	if(idx >= 0 && !_messageList.isEmpty())
+	  dupeId = _messageList[idx]->msgId();
+      }
       if((*iter).msgId() != dupeId) {
 	if(!grouplist.isEmpty()) {
 	  QDateTime nextTs = grouplist.value(0).timestamp();
@@ -237,20 +281,18 @@ int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
 	    Message dayChangeMsg = Message::ChangeOfDay(nextTs);
 	    dayChangeMsg.setMsgId((*iter).msgId());
 	    grouplist.prepend(dayChangeMsg);
-	    dupeCount--;
 	  }
 	}
+	dupeId = (*iter).msgId();
 	grouplist.prepend(*iter);
-      } else {
-	dupeCount++;
       }
-
       iter++;
     }
   }
 
-  insertMessageGroup(grouplist);
-  return grouplist.count() + dupeCount;
+  if(!grouplist.isEmpty())
+    insertMessageGroup(grouplist);
+  return processedMsgs;
 }
 
 void MessageModel::customEvent(QEvent *event) {
@@ -268,7 +310,6 @@ void MessageModel::customEvent(QEvent *event) {
   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());
 }
@@ -278,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())
@@ -302,7 +342,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) {
@@ -317,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()),
@@ -326,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 {
@@ -338,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<BufferId>(_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<BufferId>();
+    return true;
+  default:
+    return false;
+  }
+}
 
 // Stuff for later
 bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
@@ -359,3 +452,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;
+}