#include "message.h"
+#include <QEvent>
+
+class ProcessBufferEvent : public QEvent {
+public:
+ inline ProcessBufferEvent() : QEvent(QEvent::User) {}
+};
+
MessageModel::MessageModel(QObject *parent)
: QAbstractItemModel(parent)
{
return true;
}
+void MessageModel::insertMessages(const QList<Message> &msglist) {
+ if(msglist.isEmpty())
+ return;
-void MessageModel::insertMessageGroup(const QList<Message> &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<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();
}
-
-void MessageModel::insertMessages(const QList<Message> &msglist) {
- if(msglist.isEmpty())
- return;
-
- if(_messageList.isEmpty()) {
- insertMessageGroup(msglist);
- return;
- }
-
+int MessageModel::insertMessagesGracefully(const QList<Message> &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<Message> 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<Message> grouplist;
MsgId id;
MsgId dupeId;
+ int dupeCount = 0;
bool fastForward = false;
QList<Message>::const_iterator iter;
if(inOrder) {
iter = msglist.constBegin();
}
- // DUPE (1 / 3)
int idx = indexForId((*iter).msgId());
- if(idx > 0)
+ 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;
+
if((*iter).msgId() != dupeId)
grouplist << *iter;
+ else
+ dupeCount++;
if(!inOrder)
iter++;
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 > 0)
- dupeId = _messageList[idx]->msgId();
- if(idx - 1 >= 0)
- id = _messageList[idx - 1]->msgId();
- else
- fastForward = true;
- }
- if((*iter).msgId() != dupeId)
+
+ 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()) {
- // DUPE (3 / 3)
- if(!fastForward && (*iter).msgId() < id) {
- insertMessageGroup(grouplist);
- grouplist.clear();
-
- // build new group
- int idx = indexForId((*iter).msgId());
- if(idx > 0)
- dupeId = _messageList[idx]->msgId();
- if(idx - 1 >= 0)
- id = _messageList[idx - 1]->msgId();
- else
- fastForward = true;
- }
- if((*iter).msgId() != dupeId)
+ if(!fastForward && (*iter).msgId() < id)
+ break;
+
+ if((*iter).msgId() != dupeId) {
+ if(!grouplist.isEmpty()) {
+ qWarning() << "copy day change check";
+ }
grouplist.prepend(*iter);
+ } else {
+ dupeCount++;
+ }
+
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<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);
}
+
// 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;
}
}
// Stuff for later
-bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
+bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
return (*m1) < (*m2);
}
projects / quassel.git / blobdiff