chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix PRS1 loader bug where chunks could be incorrectly skipped.

Browse Source 
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.
This commit is contained in:
sawinglogz 2019-05-31 21:47:28 -04:00
parent 264c41379b
commit 5fee567066
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -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;