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

Fix two issues in ResMed loader:

Browse Source 
1) If data compression option is set, loader will now try the str.edf.gz file first, with fallback to str.edf
2) Mixed Windows and Unix separators are now allowed in --datadir, which was previously causing data loss when rebuilding CPAP data.
This commit is contained in:
Guy Scharf 2020-10-05 14:52:14 -07:00 committed by Guy Scharf
parent 27291d1416
commit 34700fd9f9
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,11 +312,25 @@ int ResmedLoader::Open(const QString & dirpath)
return -1; return -1;
} }
bool compress_backups = p_profile->session->compressBackupData();
// Early check for STR.edf file, so we can early exit before creating faulty machine record. // Early check for STR.edf file, so we can early exit before creating faulty machine record.
QString strpath = importPath + "STR.edf"; // STR.edf file QString strpath = importPath + "STR.edf"; // STR.edf file
QFile f(strpath); QFile f(strpath);
if (!f.exists()) { // No STR.edf.. Do we have a STR.edf.gz? if (compress_backups) {
QString gzstrpath = strpath + STR_ext_gz;
f.setFileName(gzstrpath);
if (f.exists())
strpath += STR_ext_gz;
else
f.setFileName(strpath);
if (!f.exists()) {
qDebug() << "Missing STR.edf file";
return -1;
}
}
else if (!f.exists()) { // No STR.edf.. Do we have a STR.edf.gz?
strpath += STR_ext_gz; strpath += STR_ext_gz;
f.setFileName(strpath); f.setFileName(strpath);
@ -358,11 +372,13 @@ int ResmedLoader::Open(const QString & dirpath)
bool rebuild_from_backups = false; bool rebuild_from_backups = false;
bool create_backups = p_profile->session->backupCardData(); bool create_backups = p_profile->session->backupCardData();
bool compress_backups = p_profile->session->compressBackupData();
QString backup_path = mach->getBackupPath(); QString backup_path = mach->getBackupPath();
if (importPath == backup_path) { QDir ipath(importPath);
QDir bpath(backup_path);
if (ipath == bpath) {
// Don't create backups if importing from backup folder // Don't create backups if importing from backup folder
rebuild_from_backups = true; rebuild_from_backups = true;
create_backups = false; create_backups = false;
@ -1018,7 +1034,15 @@ QString ResmedLoader::Backup(const QString & fullname, const QString & backup_pa
// First make sure the correct backup exists in the right place // First make sure the correct backup exists in the right place
// Allow for second import of newer version of EVE and CSL edf files // Allow for second import of newer version of EVE and CSL edf files
// But don't try to copy onto itself (as when rebuilding CPAP data from backup) // But don't try to copy onto itself (as when rebuilding CPAP data from backup)
if (newname != fullname) {
QFile nf(newname);
QFile of(fullname);
QFileInfo nfi(nf);
QFileInfo ofi(of);
QDir nfdir = nfi.dir();
QDir ofdir = ofi.dir();
if (nfdir != ofdir) {
if (QFile::exists(newname)) // remove existing backup if (QFile::exists(newname)) // remove existing backup
QFile::remove(newname); QFile::remove(newname);
if (compress) { if (compress) {
@ -1053,12 +1077,13 @@ QString ResmedLoader::Backup(const QString & fullname, const QString & backup_pa
// Used to store it under Backup\Datalog // Used to store it under Backup\Datalog
// Remove any traces from old backup directory structure // Remove any traces from old backup directory structure
oldname = backup_path + RMS9_STR_datalog + "/" + filename; if (nfdir != ofdir) {
if (QFile::exists(oldname)) oldname = backup_path + RMS9_STR_datalog + "/" + filename;
QFile::remove(oldname); if (QFile::exists(oldname))
if (QFile::exists(oldname + STR_ext_gz)) QFile::remove(oldname);
QFile::remove(oldname + STR_ext_gz); if (QFile::exists(oldname + STR_ext_gz))
QFile::remove(oldname + STR_ext_gz);
}
return newname; return newname;
} }