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 18:29:01 -07:00 committed by Guy Scharf
parent 34700fd9f9
commit 6c8d9d6751
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,6 +375,8 @@ int ResmedLoader::Open(const QString & dirpath)
QString backup_path = mach->getBackupPath(); QString backup_path = mach->getBackupPath();
// Compare QDirs rather than QStrings because separators may be different, especially on Windows.
// We want to check whether import and backup paths are the same, regardless of variations in the string representations.
QDir ipath(importPath); QDir ipath(importPath);
QDir bpath(backup_path); QDir bpath(backup_path);
@ -1034,6 +1036,7 @@ 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)
// Compare QDirs rather than QStrings to handle variations in separators, etc.
QFile nf(newname); QFile nf(newname);
QFile of(fullname); QFile of(fullname);