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

Copy new STR.edf to Backup after Backup_STR scan

Browse Source
This commit is contained in:
Phil Olynyk 2020-05-18 17:42:37 -04:00
parent 2d4598d5e7
commit ee3a79af7e
1 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,25 +410,47 @@ int ResmedLoader::Open(const QString & dirpath)
QMap<QDate, STRFile> STRmap; QMap<QDate, STRFile> STRmap;
if ( ( ! rebuild_from_backups) /* && create_backups */ ) { if ( ( ! rebuild_from_backups) /* && create_backups */ ) {
// first we copy any STR_yyyymmdd.edf files and the Backup/STR.edf into STR_Backup // first we copy any STR_yyyymmdd.edf files and the Backup/STR.edf into STR_Backup and the STRmap
backupSTRfiles( strpath, importPath, backup_path, info, STRmap ); backupSTRfiles( strpath, importPath, backup_path, info, STRmap );
//Then we copy the new imported STR.edf into Backup/STR.edf //Then we copy the new imported STR.edf into Backup/STR.edf and add it to the STRmap
QString importFile(importPath+"STR.edf"); QString importFile(importPath+"STR.edf");
QString backupFile(backup_path + "STR.edf"); QString backupFile(backup_path + "STR.edf");
if ( compress_backups ) { ResMedEDFInfo * stredf = fetchSTRandVerify( importFile, info.serial );
backupFile += ".gz"; if ( stredf != nullptr ) {
if ( QFile::exists( backupFile ) ) bool addToSTRmap = true;
QFile::remove( backupFile ); QDate date = stredf->edfHdr.startdate_orig.date();
compressFile(importFile, backupFile); long int days = stredf->GetNumDataRecords();
qDebug() << importPath.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1);
if (STRmap.contains(date)) { // Keep the longer of the two STR files
qDebug() << importFile.section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1);
if (days > STRmap[date].days) {
qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "with" << STRmap[date].days;
STRmap.remove(date);
} else {
qDebug() << "Skipping" << importFile.section("/",-3,-1);
qWarning() << "New import is shorter than exisiting files - should never happen";
delete stredf;
addToSTRmap = false;
}
}
if ( addToSTRmap ) {
if ( compress_backups ) {
backupFile += ".gz";
if ( QFile::exists( backupFile ) )
QFile::remove( backupFile );
compressFile(importFile, backupFile);
}
else {
if ( QFile::exists( backupFile ) )
QFile::remove( backupFile );
if ( ! QFile::copy(importFile, backupFile) )
qWarning() << "Failed to copy" << importFile << "to" << backupFile;
}
STRmap[date] = STRFile(backupFile, days, stredf);
// Meh.. these can be calculated if ever needed for ResScan SDcard export
QFile::copy(importPath + "STR.crc", backup_path + "STR.crc");
}
} }
else {
if ( QFile::exists( backupFile ) )
QFile::remove( backupFile );
if ( ! QFile::copy(importFile, backupFile) )
qWarning() << "Failed to copy" << importFile << "to" << backupFile;
}
// Meh.. these can be calculated if ever needed for ResScan SDcard export
QFile::copy(importPath + "STR.crc", backup_path + "STR.crc");
} else { // get the STR file that is in the BACKUP folder that we are rebuilding from } else { // get the STR file that is in the BACKUP folder that we are rebuilding from
ResMedEDFInfo * stredf = fetchSTRandVerify( strpath, info.serial ); ResMedEDFInfo * stredf = fetchSTRandVerify( strpath, info.serial );
if ( stredf != nullptr ) { if ( stredf != nullptr ) {
@ -455,6 +477,7 @@ int ResmedLoader::Open(const QString & dirpath)
qDebug() << "STR_Backup folder size is " << flist.size(); qDebug() << "STR_Backup folder size is " << flist.size();
#endif #endif
qDebug() << "Add files in STR_Backup to STRmap (unless they are already there)";
// Add any STR_Backup versions to the file list // Add any STR_Backup versions to the file list
for (auto & fi : flist) { for (auto & fi : flist) {
QString filename = fi.fileName(); QString filename = fi.fileName();
@ -472,13 +495,13 @@ int ResmedLoader::Open(const QString & dirpath)
date = stredf->edfHdr.startdate_orig.date(); date = stredf->edfHdr.startdate_orig.date();
days = stredf->GetNumDataRecords(); days = stredf->GetNumDataRecords();
if (STRmap.contains(date)) { // Keep the longer of the two STR files if (STRmap.contains(date)) { // Keep the longer of the two STR files
qDebug() << filename << "overlaps" << STRmap[date].filename.section("/",-2,-1) << "for" << days << "ends" << date.addDays(days-1); qDebug() << fi.canonicalFilePath().section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1);
if (days <= STRmap[date].days) { if (days <= STRmap[date].days) {
qDebug() << "Skipping" << filename; qDebug() << "Skipping" << fi.canonicalFilePath().section("/",-3,-1);
delete stredf; delete stredf;
continue; continue;
} else { } else {
qDebug() << "Removing" << STRmap[date].filename; qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1);
STRmap.remove(date); STRmap.remove(date);
} }
} }
@ -1485,11 +1508,13 @@ bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> &
void backupSTRfiles( const QString strpath, const QString importPath, const QString backupPath, void backupSTRfiles( const QString strpath, const QString importPath, const QString backupPath,
MachineInfo & info, QMap<QDate, STRFile> & STRmap ) MachineInfo & info, QMap<QDate, STRFile> & STRmap )
{ {
Q_UNUSED(strpath);
qDebug() << "Entering backupSTRfiles during new IMPORT";
QDir dir; QDir dir;
// Qstring strBackupPath(backupPath+"STR_Backup"); // Qstring strBackupPath(backupPath+"STR_Backup");
QStringList strfiles; QStringList strfiles;
// add primary STR.edf - make sure it ends up in the STRmap // add Backup/STR.edf - make sure it ends up in the STRmap
strfiles.push_back(strpath); strfiles.push_back(backupPath+"STR.edf");
// Just in case we are importing from a Backup folder in a different Profile, process OSCAR backup structures // Just in case we are importing from a Backup folder in a different Profile, process OSCAR backup structures
QString strBackupPath(importPath + "STR_Backup"); QString strBackupPath(importPath + "STR_Backup");
@ -1544,14 +1569,14 @@ void backupSTRfiles( const QString strpath, const QString importPath, const QStr
backupfile = compress_backups ? gzfile : nongzfile; backupfile = compress_backups ? gzfile : nongzfile;
STRmap[date] = STRFile(backupfile, days, stredf); STRmap[date] = STRFile(backupfile, days, stredf);
qDebug() << "Adding" << filename.section("/",-2,-1) << "as" << backupfile.section("/", -3, -1) << "to STRMAP"; qDebug() << "Adding" << filename.section("/",-2,-1) << "with" << days << "days as" << backupfile.section("/", -3, -1) << "to STRmap";
if ( QFile::exists(backupfile)) { if ( QFile::exists(backupfile)) {
QFile::remove(backupfile); QFile::remove(backupfile);
} }
#ifdef STR_DEBUG // #ifdef STR_DEBUG
qDebug() << "Copying" << filename << "to" << backupfile; qDebug() << "Copying" << filename << "to" << backupfile;
#endif // #endif
if (filename.endsWith(STR_ext_gz,Qt::CaseInsensitive)) { // we have a compressed file if (filename.endsWith(STR_ext_gz,Qt::CaseInsensitive)) { // we have a compressed file
if (compress_backups) { // fine, copy it to backup folder if (compress_backups) { // fine, copy it to backup folder
QFile::copy(filename, backupfile); QFile::copy(filename, backupfile);
@ -1575,6 +1600,7 @@ void backupSTRfiles( const QString strpath, const QString importPath, const QStr
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "STRmap has" << STRmap.size() << "entries"; qDebug() << "STRmap has" << STRmap.size() << "entries";
#endif #endif
qDebug() << "Leaving backupSTRfiles during nre IMPORT";
} }
QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info) QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info)