From 7a00009a56c7f45dc469c95a3f8ea106129480a6 Mon Sep 17 00:00:00 2001
From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2019 16:50:40 -0400
Subject: [PATCH] Add result of parsing/importing to PRS1 chunk and session
 YAML.

---
 oscar/tests/prs1tests.cpp    | 16 +++++++++-------
 oscar/tests/sessiontests.cpp |  3 ++-
 oscar/tests/sessiontests.h   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp
index 57825781..15079983 100644
--- a/oscar/tests/prs1tests.cpp
+++ b/oscar/tests/prs1tests.cpp
@@ -100,12 +100,12 @@ void parseAndEmitSessionYaml(const QString & path)
 
         // Run the parser
         PRS1Import* import = dynamic_cast<PRS1Import*>(task);
-        import->ParseSession();
+        bool ok = import->ParseSession();
         
         // Emit the parsed session data to compare against our regression benchmarks
         Session* session = import->session;
         QString outpath = prs1OutputPath(path, m->serial(), session->session(), "-session.yml");
-        SessionToYaml(outpath, session);
+        SessionToYaml(outpath, session, ok);
         
         delete session;
         delete task;
@@ -150,13 +150,14 @@ static QString byteList(QByteArray data, int limit=-1)
     return s;
 }
 
-void ChunkToYaml(QFile & file, PRS1DataChunk* chunk)
+void ChunkToYaml(QFile & file, PRS1DataChunk* chunk, bool ok)
 {
     QTextStream out(&file);
 
     // chunk header
     out << "chunk:" << endl;
     out << "  at: " << hex << chunk->m_filepos << endl;
+    out << "  parsed: " << ok << endl;
     out << "  version: " << dec << chunk->fileVersion << endl;
     out << "  size: " << chunk->blockSize << endl;
     out << "  htype: " << chunk->htype << endl;
@@ -302,17 +303,18 @@ void parseAndEmitChunkYaml(const QString & path)
             QList<PRS1DataChunk *> chunks = s_loader->ParseFile(inpath);
             for (int i=0; i < chunks.size(); i++) {
                 PRS1DataChunk * chunk = chunks.at(i);
+                bool ok = true;
                 
                 // Parse the inner data.
                 switch (chunk->ext) {
-                    case 0: chunk->ParseCompliance(); break;
-                    case 1: chunk->ParseSummary(); break;
-                    case 2: chunk->ParseEvents(MODE_UNKNOWN); break;
+                    case 0: ok = chunk->ParseCompliance(); break;
+                    case 1: ok = chunk->ParseSummary(); break;
+                    case 2: ok = chunk->ParseEvents(MODE_UNKNOWN); break;
                     default: break;
                 }
                 
                 // Emit the YAML.
-                ChunkToYaml(file, chunk);
+                ChunkToYaml(file, chunk, ok);
                 delete chunk;
             }
             
diff --git a/oscar/tests/sessiontests.cpp b/oscar/tests/sessiontests.cpp
index 5b12d537..c677bf21 100644
--- a/oscar/tests/sessiontests.cpp
+++ b/oscar/tests/sessiontests.cpp
@@ -169,7 +169,7 @@ static QString intList(quint32* data, int count, int limit=-1)
     return s;
 }
 
-void SessionToYaml(QString filepath, Session* session)
+void SessionToYaml(QString filepath, Session* session, bool ok)
 {
     QFile file(filepath);
     if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
@@ -182,6 +182,7 @@ void SessionToYaml(QString filepath, Session* session)
     out << "  id: " << session->session() << endl;
     out << "  start: " << ts(session->first()) << endl;
     out << "  end: " << ts(session->last()) << endl;
+    out << "  valid: " << ok << endl;
     
     if (!session->m_slices.isEmpty()) {
         out << "  slices:" << endl;
diff --git a/oscar/tests/sessiontests.h b/oscar/tests/sessiontests.h
index 01e8e438..03dceeb4 100644
--- a/oscar/tests/sessiontests.h
+++ b/oscar/tests/sessiontests.h
@@ -11,6 +11,6 @@
 
 #include "../SleepLib/session.h"
 
-void SessionToYaml(QString filepath, Session* session);
+void SessionToYaml(QString filepath, Session* session, bool ok);
 
 #endif // SESSIONTESTS_H