From 7d72f71fb491db6f286b400e08812c065c9e0c06 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 15 Aug 2019 16:14:54 -0400
Subject: [PATCH] Add a critical warning when a duplicate session is added to a
 Day object.

This is one step closer to the root cause of the crash, in which duplicate
sessions were being created during a rebuild.
---
 oscar/SleepLib/day.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/oscar/SleepLib/day.cpp b/oscar/SleepLib/day.cpp
index b2dda6be..56117ae2 100644
--- a/oscar/SleepLib/day.cpp
+++ b/oscar/SleepLib/day.cpp
@@ -109,7 +109,7 @@ void Day::addSession(Session *s)
     if (mi != machines.end()) {
         if (mi.value() != s->machine()) {
             qDebug() << "OSCAR can't add session" << s->session()
-                     << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
+                     << "["+QDateTime::fromTime_t(s->first()).toString("MMM dd, yyyy hh:mm:ss")+"]"
                      << "from machine" << mi.value()->serial() << "to machine" << s->machine()->serial()
                      << "to this day record, as it already contains a different machine of the same MachineType" << s->type();
             return;
@@ -118,12 +118,22 @@ void Day::addSession(Session *s)
         machines[s->type()] = s->machine();
     }
 
-    if (s->first() == 0)
+    if (s->first() == 0) {
         qWarning() << "Day::addSession discarding session" << s->session()
-                 << "["+QDateTime::fromTime_t(s->session()).toString("MMM dd, yyyy hh:mm:ss")+"]"
                  << "from machine" << s->machine()->serial() << "with first=0";
-    else
-        sessions.push_back(s);
+        return;
+    }
+    
+    for (auto & sess : sessions) {
+        if (sess->session() == s->session() && sess->type() == s->type()) {
+            // This usually indicates a problem in purging or cleanup somewhere,
+            // unless there's a problem with a parser.
+            qCritical() << "Day object" << this->date().toString() << "adding duplicate session" << s->session();
+            // Don't skip this one, since it might have replaced the original elsewhere already.
+            //return;
+        }
+    }
+    sessions.push_back(s);
 }
 
 EventDataType Day::calcMiddle(ChannelID code)