From 5fee567066adef39fe4b48008066bfad37fb8574 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 31 May 2019 21:47:28 -0400 Subject: [PATCH] Fix PRS1 loader bug where chunks could be incorrectly skipped. This doesn't fix the bigger bug where files are skipped based on their filename rather than the actual chunk session IDs. That's a trickier challenge for another day. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index c5d6b19d..a22df34f 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -1007,7 +1007,10 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin } */ - + // TODO: BUG: This isn't right, since files can have multiple session + // chunks, which might not correspond to the filename. But before we can + // fix this we need to come up with a reasonably fast way to filter previously + // imported files without re-reading all of them. if (m->SessionExists(sid)) { // Skip already imported session qDebug() << path << "session already exists, skipping" << sid; @@ -1061,7 +1064,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin if (i > 0 || chunk_sid != sid) { // log multiple chunks in non-waveform files and session ID mismatches qDebug() << fi.canonicalFilePath() << chunk_sid; } - if (m->SessionExists(sid)) { // BUG: this should presumably be chunk_sid, but any change needs to be tested. + if (m->SessionExists(chunk_sid)) { qDebug() << path << "session already exists, skipping" << sid << chunk_sid; delete chunk; continue;