From 330bdb6fb35d13436dc62c22d8cc9d3868622244 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2019 16:08:40 -0400
Subject: [PATCH] Split ParseCompliance into F0V23 and F0V6.

Also add some debug messages to FV3 parsing. It's clear the current
approach is wrong. This looks a lot like the slices seen earlier,
since hbdata values appear more than once in a given file.

Also turn off summary YAML since the next bit of work will focus on
parsing.
---
 oscar/SleepLib/loader_plugins/prs1_loader.cpp | 48 ++++++++++++++++++-
 oscar/SleepLib/loader_plugins/prs1_loader.h   |  8 +++-
 oscar/tests/prs1tests.cpp                     |  2 +-
 3 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
index 9817e481..8293f469 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp
@@ -3232,10 +3232,32 @@ bool PRS1Import::ImportCompliance()
 
 bool PRS1DataChunk::ParseCompliance(void)
 {
-    // This parser doesn't seem right for 200X series, so bail for now.
-    if (this->family != 0 || this->familyVersion != 2) {
+    switch (this->family) {
+    case 0:
+        if (this->familyVersion == 6) {
+            return this->ParseComplianceF0V6();
+        } else if (this->familyVersion == 2 || this->familyVersion == 3) {
+            return this->ParseComplianceF0V23();
+        }
+    default:
+        ;
+    }
+
+    qWarning() << "unexpected family" << this->family << "familyVersion" << this->familyVersion;
+    return false;
+}
+
+
+bool PRS1DataChunk::ParseComplianceF0V23(void)
+{
+    if (this->family != 0 || (this->familyVersion != 2 && this->familyVersion != 3)) {
+        qWarning() << "ParseComplianceF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
         return false;
     }
+    // F0V3 is untested, but since summary and events seem to be the same for F0V2 and F0V3,
+    // we'll assume this one is for now, but flag it as unexpected.
+    CHECK_VALUE(this->familyVersion, 2);
+    
     // TODO: hardcoding this is ugly, think of a better approach
     if (this->m_data.size() < 0x13) {
         qWarning() << this->sessionid << "compliance data too short:" << this->m_data.size();
@@ -3733,6 +3755,19 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
 }
 
 
+bool PRS1DataChunk::ParseComplianceF0V6(void)
+{
+    if (this->family != 0 || this->familyVersion != 6) {
+        qWarning() << "ParseComplianceF0V2 called with family" << this->family << "familyVersion" << this->familyVersion;
+        return false;
+    }
+    
+    // Not implemented yet!
+    
+    return false;
+}
+
+
 bool PRS1DataChunk::ParseSummaryF0V6()
 {
     // DreamStation machines...
@@ -4088,14 +4123,23 @@ bool PRS1DataChunk::ParseSummary()
             bsize = it.value();
 
             if (val != 1) {
+                if (this->hbdata.contains(val)) {
+                    qWarning() << this->sessionid << "duplicate hbdata val" << val;
+                }
                 // store the data block for later reference
                 this->hbdata[val] = QByteArray((const char *)(&data[pos]), bsize);
             } else {
+                if (!this->mainblock.isEmpty()) {
+                    qWarning() << this->sessionid << "duplicate mainblock";
+                }
                 // Parse the nested data structure which contains settings
                 int p2 = 0;
                 do {
                     val = data[pos + p2++];
                     len = data[pos + p2++];
+                    if (this->mainblock.contains(val)) {
+                        qWarning() << this->sessionid << "duplicate mainblock val" << val;
+                    }
                     this->mainblock[val] = QByteArray((const char *)(&data[pos+p2]), len);
                     p2 += len;
                 } while ((p2 < bsize) && ((pos+p2) < size));
diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h
index 43b9c517..60dba494 100644
--- a/oscar/SleepLib/loader_plugins/prs1_loader.h
+++ b/oscar/SleepLib/loader_plugins/prs1_loader.h
@@ -128,9 +128,15 @@ public:
     //! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader
     bool ReadData(class QFile & f);
     
-    //! \brief Parse a single data chunk from a .000 file containing compliance data for a brick
+    //! \brief Figures out which Compliance Parser to call, based on machine family/version and calls it.
     bool ParseCompliance(void);
     
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a P25x brick
+    bool ParseComplianceF0V23(void);
+    
+    //! \brief Parse a single data chunk from a .000 file containing compliance data for a DreamStation 200X brick
+    bool ParseComplianceF0V6(void);
+    
     //! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
     bool ParseSummary();
 
diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index d0115588..57825781 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -114,7 +114,7 @@ void parseAndEmitSessionYaml(const QString & path)
 
 void PRS1Tests::testSessionsToYaml()
 {
-    iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
+    //iterateTestCards(TESTDATA_PATH "prs1/input/", parseAndEmitSessionYaml);
 }