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 a rare PRS1 session duplicate condition affecting multi-chunk sessions

Browse Source
This commit is contained in:
Mark Watkins 2014-07-11 01:13:44 -05:00
parent 4c9f265b45
commit 422c4821f0
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -456,6 +456,11 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
prs1sessions.clear();
new_sessions.clear(); // this hash is used by OpenFile
// Note, I have observed p0/p1/etc folders containing duplicates session files (in Robin Sanders data.)
// for each p0/p1/p2/etc... folder
for (int p=0; p < size; ++p) {
dir.setPath(paths.at(p));
@ -487,6 +492,9 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
PRS1FileGroup * group = nullptr;
// There is a Problem here
// The previous session could have a data chunk that encompasses this sessions data, causing duplicate sessions during initial import.
QHash<SessionID, PRS1FileGroup*>::iterator it = prs1sessions.find(sid);
if (it != prs1sessions.end()) {
group = it.value();
@ -500,15 +508,19 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
switch (ext) {
case 0:
if (!group->compliance.isEmpty()) continue;
group->compliance = fi.canonicalFilePath();
break;
case 1:
if (!group->summary.isEmpty()) continue;
group->summary = fi.canonicalFilePath();
break;
case 2:
if (!group->event.isEmpty()) continue;
group->event = fi.canonicalFilePath();
break;
case 5:
if (!group->waveform.isEmpty()) continue;
group->waveform = fi.canonicalFilePath();
break;
default:
@ -517,6 +529,7 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile)
}
}
int tasks = countTasks();
runTasks(p_profile->session->multithreading());
return tasks;
@ -1448,13 +1461,14 @@ bool PRS1SessionData::ParseWaveforms()
void PRS1Import::run()
{
group->ParseChunks();
group->ParseChunks(loader);
QMap<SessionID, PRS1SessionData*>::iterator it;
// Do session lists..
for (it = group->sessions.begin(); it != group->sessions.end(); ++it) {
PRS1SessionData * sg = it.value();
sg->session = new Session(mach, it.key());
if (!sg->ParseSummary()) {
@ -1493,8 +1507,10 @@ void PRS1Import::run()
delete group;
}
void PRS1FileGroup::ParseChunks()
void PRS1FileGroup::ParseChunks(PRS1Loader * ldr)
{
loader = ldr;
// qDebug() << "Parsing chunks for session" << summary << event;
if (ParseFile(compliance)) {
// Compliance only piece of crap machine, nothing else to do.. :(
@ -1504,6 +1520,8 @@ void PRS1FileGroup::ParseChunks()
ParseFile(summary);
ParseFile(event);
ParseFile(waveform);
}
bool PRS1FileGroup::ParseFile(QString path)
@ -1533,6 +1551,7 @@ bool PRS1FileGroup::ParseFile(QString path)
int lastblocksize = 0;
int cruft = 0;
int firstsession = 0;
do {
QByteArray headerBA = f.read(16);
@ -1547,6 +1566,10 @@ bool PRS1FileGroup::ParseFile(QString path)
chunk = new PRS1DataChunk();
chunk->sessionid = (header[10] << 24) | (header[9] << 16) | (header[8] << 8) | header[7];
if (!firstsession) {
firstsession = chunk->sessionid;
}
chunk->fileVersion = header[0];
chunk->htype = header[3]; // 00 = normal ?? // 01=waveform ?? // could be a bool signifying extra header bytes?
chunk->family = header[4];
@ -1636,6 +1659,19 @@ bool PRS1FileGroup::ParseFile(QString path)
delete chunk;
return false;
}
// Check for a valid file group with this sessionid
if ((chunk->sessionid != firstsession) && (loader->prs1sessions.find(chunk->sessionid) != loader->prs1sessions.end())) {
delete chunk;
return true;
// I don't see a point in skipping this block, because the next sessions files are present
// if (!f.seek(f.pos()+blocksize)) {
// return;
// }
}
// Read data block
chunk->m_data = f.read(blocksize);

14
sleepyhead/SleepLib/loader_plugins/prs1_loader.h
View File

@ -129,15 +129,17 @@ public:
QList<PRS1DataChunk *> waveforms;
};
class PRS1Loader;
struct PRS1FileGroup
{
PRS1FileGroup() {}
PRS1FileGroup() { loader = NULL; }
PRS1FileGroup(const PRS1FileGroup & copy) {
compliance = copy.compliance;
summary = copy.summary;
event = copy.event;
waveform = copy.waveform;
loader = copy.loader;
}
~PRS1FileGroup() {
}
@ -148,13 +150,13 @@ struct PRS1FileGroup
QString waveform;
bool ParseFile(QString path);
void ParseChunks();
void ParseChunks(PRS1Loader *);
PRS1Loader * loader;
QMap<SessionID, PRS1SessionData*> sessions;
};
class PRS1Loader;
class PRS1Import:public ImportTask
{
public:
@ -195,6 +197,9 @@ class PRS1Loader : public MachineLoader
//! \brief Register this Module to the list of Loaders, so it knows to search for PRS1 data.
static void Register();
QHash<SessionID, PRS1FileGroup*> prs1sessions;
protected:
QString last;
QHash<QString, Machine *> PRS1List;
@ -231,7 +236,6 @@ class PRS1Loader : public MachineLoader
//! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing.
QHash<SessionID, Session *> new_sessions;
QHash<SessionID, PRS1FileGroup*> prs1sessions;
qint32 summary_duration;
};