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

Look for AS11 Ident file first

Browse Source
This commit is contained in:
Phil Olynyk 2021-10-27 23:23:38 -04:00
parent 71f77d1336
commit 69a515baf2
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -285,9 +285,14 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
MachineInfo info = newInfo(); MachineInfo info = newInfo();
scanProductObject( product, &info, nullptr); scanProductObject( product, &info, nullptr);
return info; return info;
} } else
} qDebug() << "No Product in Profiles";
} } else
qDebug() << "No IdentificationProfiles in FlowGenerator";
} else
qDebug() << "No FlowGenerator in Identification.json";
return MachineInfo();
} }
// Abort if this file is dodgy.. // Abort if this file is dodgy..
@ -1833,6 +1838,28 @@ bool parseIdentFile( QString path, MachineInfo * info, QHash<QString, QString> &
QFile f(filename); QFile f(filename);
QFile j(path + RMS9_STR_idfile + STR_ext_JSON); QFile j(path + RMS9_STR_idfile + STR_ext_JSON);
if (j.exists() ) { // chose the AS11 file if both exist
if ( !j.open(QIODevice::ReadOnly)) {
return false;
}
QByteArray identData = j.readAll();
j.close();
QJsonDocument identDoc(QJsonDocument::fromJson(identData));
QJsonObject identObj(identDoc.object());
if ( identObj.contains("FlowGenerator") && identObj["FlowGenerator"].isObject()) {
QJsonObject flow = identObj["FlowGenerator"].toObject();
if ( flow.contains("IdentificationProfiles") && flow["IdentificationProfiles"].isObject()) {
QJsonObject profiles = flow["IdentificationProfiles"].toObject();
if ( profiles.contains("Product") && profiles["Product"].isObject()) {
QJsonObject product = profiles["Product"].toObject();
// passed in MachineInfo info = newInfo();
scanProductObject( product, info, &idmap);
return true;
}
}
}
return false;
}
// Abort if this file is dodgy.. // Abort if this file is dodgy..
if (f.exists() ) { if (f.exists() ) {
if ( !f.open(QIODevice::ReadOnly)) { if ( !f.open(QIODevice::ReadOnly)) {
@ -1852,28 +1879,6 @@ bool parseIdentFile( QString path, MachineInfo * info, QHash<QString, QString> &
f.close(); f.close();
return true; return true;
} }
if (j.exists() ) {
if ( !j.open(QIODevice::ReadOnly)) {
return false;
}
QByteArray identData = j.readAll();
j.close();
QJsonDocument identDoc(QJsonDocument::fromJson(identData));
QJsonObject identObj(identDoc.object());
if ( identObj.contains("FlowGenerator") && identObj["FlowGenerator"].isObject()) {
QJsonObject flow = identObj["FlowGenerator"].toObject();
if ( flow.contains("IdentificationProfiles") && flow["IdentificationProfiles"].isObject()) {
QJsonObject profiles = flow["IdentificationProfiles"].toObject();
if ( profiles.contains("Product") && profiles["Product"].isObject()) {
QJsonObject product = profiles["Product"].toObject();
// MachineInfo info = newInfo();
scanProductObject( product, info, &idmap);
return true;
}
}
}
}
return false; return false;
} }