- } else {
- while(iter != msglist.constEnd()) {
- 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++;
- }
-
- iter++;
+
+ if (!inOrder)
+ ++iter;
+
+ if (inOrder) {
+ while (iter != msglist.constBegin()) {
+ --iter;
+
+ 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 && !messagesIsEmpty())
+ dupeId = messageItemAt(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);
+ qint64 nextDay = nextTs.toMSecsSinceEpoch() / DAY_IN_MSECS;
+ qint64 prevDay = prevTs.toMSecsSinceEpoch() / DAY_IN_MSECS;
+ if (nextDay != prevDay) {
+ nextTs.setMSecsSinceEpoch(nextDay * DAY_IN_MSECS);
+ nextTs.setTimeSpec(Qt::LocalTime);
+ Message dayChangeMsg = Message::ChangeOfDay(nextTs);
+ dayChangeMsg.setMsgId((*iter).msgId());
+ grouplist.prepend(dayChangeMsg);
+ }
+ }
+ dupeId = (*iter).msgId();
+ grouplist.prepend(*iter);
+ }
+ }
+ }
+ else {
+ while (iter != msglist.constEnd()) {
+ 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 && !messagesIsEmpty())
+ dupeId = messageItemAt(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);
+ qint64 nextDay = nextTs.toMSecsSinceEpoch() / DAY_IN_MSECS;
+ qint64 prevDay = prevTs.toMSecsSinceEpoch() / DAY_IN_MSECS;
+ if (nextDay != prevDay) {
+ nextTs.setMSecsSinceEpoch(nextDay * DAY_IN_MSECS);
+ nextTs.setTimeSpec(Qt::LocalTime);
+ Message dayChangeMsg = Message::ChangeOfDay(nextTs);
+ dayChangeMsg.setMsgId((*iter).msgId());
+ grouplist.prepend(dayChangeMsg);
+ }
+ }
+ dupeId = (*iter).msgId();
+ grouplist.prepend(*iter);
+ }
+ ++iter;
+ }