- // DUPE (2 / 3)
- if(!fastForward && (*iter).msgId() < id) {
- insertMessageGroup(grouplist);
- grouplist.clear();
-
- // build new group
- int idx = indexForId((*iter).msgId());
- if(idx - 1 >= 0)
- id = _messageList[idx - 1]->msgId();
- else
- fastForward = true;
+
+ if(!fastForward && (*iter).msgId() < id)
+ 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();
+ 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);
+ }
+ }
+ dupeId = (*iter).msgId();
+ grouplist.prepend(*iter);