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

Clean up, and copy Backup/STR.edf to Backup?STR_Backup/STR_yyyymmdd.edf

Browse Source 
before copying import/STR.edf to Backup/STR.edf.
This commit is contained in:
Phil Olynyk 2020-05-17 19:24:31 -04:00
parent 60588ccd30
commit b9cccdc746
1 changed files with 109 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,9 +245,10 @@ MachineInfo ResmedLoader::PeekInfo(const QString & path)
long event_cnt = 0; long event_cnt = 0;
bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> & idmap ); // forward bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> & idmap ); // forward
void BackupSTRfiles( const QString strpath, const QString importPath, const QString strBackupPath, void backupSTRfiles( const QString strpath, const QString importPath, const QString backupPath,
MachineInfo & info, QMap<QDate, STRFile> & STRmap ); // forward MachineInfo & info, QMap<QDate, STRFile> & STRmap ); // forward
ResMedEDFInfo * fetchSTRandVerify( QString filename, QString serialNumber ); // forward
int ResmedLoader::Open(const QString & dirpath, ResDaySaveCallback s) // alternate for unit testing int ResmedLoader::Open(const QString & dirpath, ResDaySaveCallback s) // alternate for unit testing
{ {
@ -348,7 +349,7 @@ int ResmedLoader::Open(const QString & dirpath)
firstImportDay = ignoreBefore.date(); firstImportDay = ignoreBefore.date();
qDebug() << "First day to import: " << firstImportDay.toString(); qDebug() << "First day to import: " << firstImportDay.toString();
bool importing_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(); bool compress_backups = p_profile->session->compressBackupData();
@ -356,7 +357,7 @@ int ResmedLoader::Open(const QString & dirpath)
if (importPath == backup_path) { if (importPath == backup_path) {
// Don't create backups if importing from backup folder // Don't create backups if importing from backup folder
importing_backups = true; rebuild_from_backups = true;
create_backups = false; create_backups = false;
} }
@ -368,17 +369,50 @@ int ResmedLoader::Open(const QString & dirpath)
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Create the backup folder for storing a copy of everything in.. // Create the backup folder structure for storing a copy of everything in..
// (Unless we are importing from this backup folder) // (Unless we are importing from this backup folder)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
QDir dir; QDir dir;
if (create_backups) { if (create_backups) {
if ( ! dir.exists(backup_path)) { if ( ! dir.exists(backup_path)) {
if ( ! dir.mkpath(backup_path + RMS9_STR_datalog)) { if ( ! dir.mkpath(backup_path) ) {
qDebug() << "Could not create ResMed backup directory :-/"; qDebug() << "Could not create ResMed backup directory :-/";
} }
} }
// Create the STR_Backup folder if it doesn't exist
QString strBackupPath = backup_path + "STR_Backup";
if ( ! dir.exists(strBackupPath) )
dir.mkpath(strBackupPath);
QString newpath = backup_path + "DATALOG";
if ( ! dir.exists(newpath) )
dir.mkpath(newpath);
// Copy Identification files to backup folder
QFile::copy(importPath + RMS9_STR_idfile + STR_ext_TGT, backup_path + RMS9_STR_idfile + STR_ext_TGT);
QFile::copy(importPath + RMS9_STR_idfile + STR_ext_CRC, backup_path + RMS9_STR_idfile + STR_ext_CRC);
}
///////////////////////////////////////////////////////////////////////////////////
// Open and Process STR.edf files (including those listed in STR_Backup)
///////////////////////////////////////////////////////////////////////////////////
resdayList.clear();
emit updateMessage(QObject::tr("Locating STR.edf File(s)..."));
QCoreApplication::processEvents();
// List all STR.edf backups and tag on latest for processing
QMap<QDate, STRFile> STRmap;
if ( ( ! rebuild_from_backups) /* && create_backups */ ) {
// first we copy any STR_yyyymmdd.edf files and the Backup/STR.edf into STR_Backup
backupSTRfiles( strpath, importPath, backup_path, info, STRmap );
//Then we copy the new imported STR.edf into Backup/STR.edf
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 ) { if ( compress_backups ) {
@ -393,59 +427,17 @@ int ResmedLoader::Open(const QString & dirpath)
if ( ! QFile::copy(importFile, backupFile) ) if ( ! QFile::copy(importFile, backupFile) )
qWarning() << "Failed to copy" << importFile << "to" << backupFile; qWarning() << "Failed to copy" << importFile << "to" << backupFile;
} }
// Copy Identification files to backup folder
QFile::copy(importPath + RMS9_STR_idfile + STR_ext_TGT, backup_path + RMS9_STR_idfile + STR_ext_TGT);
QFile::copy(importPath + RMS9_STR_idfile + STR_ext_CRC, backup_path + RMS9_STR_idfile + STR_ext_CRC);
// Meh.. these can be calculated if ever needed for ResScan SDcard export // Meh.. these can be calculated if ever needed for ResScan SDcard export
QFile::copy(importPath + "STR.crc", backup_path + "STR.crc"); QFile::copy(importPath + "STR.crc", backup_path + "STR.crc");
}
///////////////////////////////////////////////////////////////////////////////////
// Open and Parse STR.edf files (including those listed in STR_Backup)
///////////////////////////////////////////////////////////////////////////////////
resdayList.clear();
emit updateMessage(QObject::tr("Locating STR.edf File(s)..."));
QCoreApplication::processEvents();
// List all STR.edf backups and tag on latest for processing
QMap<QDate, STRFile> STRmap;
// Create the STR_Backup folder if it doesn't exist
QString strBackupPath = backup_path + "STR_Backup";
if ( ! dir.exists(strBackupPath))
dir.mkpath(strBackupPath);
QString newpath = backup_path + "DATALOG";
if ( ! dir.exists(newpath) )
dir.mkpath(newpath);
if ( ( ! importing_backups) /* && create_backups */ ) {
BackupSTRfiles( strpath, importPath, strBackupPath, info, STRmap );
} 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 = new ResMedEDFInfo(); ResMedEDFInfo * stredf = fetchSTRandVerify( strpath, info.serial );
if ( stredf->Open(strpath) ) { if ( stredf != nullptr ) {
if ( stredf->Parse()) { QDate date = stredf->edfHdr.startdate_orig.date();
if (stredf->serialnumber != info.serial) { long int days = stredf->GetNumDataRecords();
qDebug() << "Identification.tgt Serial number doesn't match" << strpath; qDebug() << strpath.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1);
delete stredf; STRmap[date] = STRFile(strpath, days, stredf);
} else { // passed the tests, stuff it into the map
QDate date = stredf->edfHdr.startdate_orig.date();
long int days = stredf->GetNumDataRecords();
qDebug() << strpath.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1);
STRmap[date] = STRFile(strpath, days, stredf);
}
} else {
qDebug() << "Faulty STR file" << strpath;
delete stredf;
}
} else { } else {
qDebug() << "Failed to open" << strpath; qDebug() << "Failed to open" << strpath;
delete stredf;
} }
} // end if not importing the backup files } // end if not importing the backup files
#ifdef STR_DEBUG #ifdef STR_DEBUG
@ -472,23 +464,9 @@ int ResmedLoader::Open(const QString & dirpath)
continue; continue;
QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01"; QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01";
ResMedEDFInfo * stredf = new ResMedEDFInfo(); ResMedEDFInfo * stredf = fetchSTRandVerify( fi.canonicalFilePath(), info.serial );
if ( ! stredf->Open(fi.canonicalFilePath() ) ) { if ( stredf == nullptr )
qDebug() << "Failed to open" << fi.canonicalFilePath();
delete stredf;
continue; continue;
}
if ( ! stredf->Parse()) {
qDebug() << "Faulty STR file" << filename;
delete stredf;
continue;
}
if (stredf->serialnumber != info.serial) {
qDebug() << "Identification.tgt Serial number doesn't match" << filename;
delete stredf;
continue;
}
// Don't trust the filename date, pick the one inside the STR... // Don't trust the filename date, pick the one inside the STR...
date = stredf->edfHdr.startdate_orig.date(); date = stredf->edfHdr.startdate_orig.date();
@ -499,12 +477,13 @@ int ResmedLoader::Open(const QString & dirpath)
qDebug() << "Skipping" << filename; qDebug() << "Skipping" << filename;
delete stredf; delete stredf;
continue; continue;
} else {
qDebug() << "Removing" << STRmap[date].filename;
STRmap.remove(date);
} }
} }
// qDebug() << "Resetting STR date from" << date.toString() << "to first of month ... WHY???";
// date = QDate(date.year(), date.month(), 1);
qDebug() << fi.canonicalFilePath().section("/", -2,-1) << "starts at" << date << "for" << days; qDebug() << "Adding" << fi.canonicalFilePath().section("/", -2,-1) << "starts at" << date << "for" << days;
STRmap[date] = STRFile(fi.canonicalFilePath(), days, stredf); STRmap[date] = STRFile(fi.canonicalFilePath(), days, stredf);
} // end for walking the STR_Backup directory } // end for walking the STR_Backup directory
#ifdef STR_DEBUG #ifdef STR_DEBUG
@ -648,6 +627,28 @@ int ResmedLoader::Open(const QString & dirpath)
return num_new_sessions; return num_new_sessions;
} // end Open() } // end Open()
ResMedEDFInfo * fetchSTRandverify( QString filename, QString serialNumber)
{
ResMedEDFInfo * stredf = new ResMedEDFInfo();
if ( ! stredf->Open(filename ) ) {
qDebug() << "Failed to open" << filename;
delete stredf;
return nullptr;
}
if ( ! stredf->Parse()) {
qDebug() << "Faulty STR file" << filename;
delete stredf;
return nullptr;
}
if (stredf->serialnumber != serialNumber) {
qDebug() << "Identification.tgt Serial number doesn't match" << filename;
delete stredf;
return nullptr;
}
return stredf;
}
void StoreSettings(Session * sess, STRRecord & R); // forward void StoreSettings(Session * sess, STRRecord & R); // forward
void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * mach ) void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * mach )
{ {
@ -1481,47 +1482,23 @@ bool parseIdentTGT( QString path, MachineInfo * info, QHash<QString, QString> &
return true; return true;
} }
void BackupSTRfiles( const QString strpath, const QString importPath, const QString strBackupPath, 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(importPath);
// The commented-out code has been done before this routine is called - this routine
// copies the files from importpath/STR_Backup into backupPath/STR_Backup
//
// // copy the STR.edf file into Backup folder, safely
// QString strBackupFile(backupPath+"STR.edf");
// if (QFile::exists(strBackupFile) ) {
// qDebug() << "Renaming existing STR.edf file";
// if ( ! QFile::rename(strBackupFile, strBackupFile+"~") )
// qWarning() << "Failed to rename" << strBackupFile;
// }
// qDebug() << "Copy inported STR.edf into Backup";
// if ( ! QFile::copy(strpath, strBackupFile) ) {
// qWarning() << "Failed to copy STR.edf to Backup folder";
// qDebug() << "Undoing rename of existing STR.edf file";
// if ( ! QFile::rename(strBackupFile+"~", strBackupFile) ) {
// qWarning() << "Failed to rename" << strBackupFile << "+~";
// }
// }
// else { // copy was successful, remove the old, renamed copy
// qDebug() << "Remove the renamed STR.edf file";
// if ( ! QFile::remove(strBackupFile+"~") )
// qWarning() << "Failed to remove" << strBackupFile << "+~";
// }
QDir dir; QDir dir;
// Qstring strBackupPath(backupPath+"STR_Backup");
QStringList strfiles; QStringList strfiles;
// add primary STR.edf - make sure it ends up in the STRmap // add primary STR.edf - make sure it ends up in the STRmap
strfiles.push_back(strpath); strfiles.push_back(strpath);
// Just in case we are importing from a Backup folder, 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");
dir.setPath(strBackupPath); dir.setPath(strBackupPath);
dir.setFilter(QDir::Files | QDir::Hidden | QDir::Readable); dir.setFilter(QDir::Files | QDir::Hidden | QDir::Readable);
QFileInfoList flist = dir.entryInfoList(); QFileInfoList flist = dir.entryInfoList();
// 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) { // this is empty if imprting from an SD card
QString filename = fi.fileName(); QString filename = fi.fileName();
if ( ! filename.startsWith("STR", Qt::CaseInsensitive)) if ( ! filename.startsWith("STR", Qt::CaseInsensitive))
continue; continue;
@ -1536,35 +1513,29 @@ void BackupSTRfiles( const QString strpath, const QString importPath, const QStr
// Now copy any of these files to the Backup folder adding the file date to the file name // Now copy any of these files to the Backup folder adding the file date to the file name
// and put it into the STRmap structure // and put it into the STRmap structure
for (auto & filename : strfiles) { for (auto & filename : strfiles) {
ResMedEDFInfo * stredf = new ResMedEDFInfo(); QDate date;
if ( ! stredf->Open(filename) ) { long int days;
qDebug() << "Failed to open" << filename.section("/", -2, -1); ResMedEDFInfo * stredf = fetchSTRandVerify( filename, info.serial );
delete stredf; if ( stredf == nullptr )
continue; continue;
} date = stredf->edfHdr.startdate_orig.date();
if ( ! stredf->Parse()) { days = stredf->GetNumDataRecords();
qDebug() << "Faulty STR file" << filename.section("/", -2, -1);
delete stredf;
continue;
}
if (stredf->serialnumber != info.serial) {
qDebug() << "Identification.tgt Serial number doesn't match" << filename.section("/", -2, -1);
delete stredf;
continue;
}
QDate date = stredf->edfHdr.startdate_orig.date();
long int days = stredf->GetNumDataRecords();
if (STRmap.contains(date)) { if (STRmap.contains(date)) {
qDebug() << "STRmap already contains" << date.toString("yyyy-MM-dd") << "for" << days << "ending" << date.addDays(days-1); qDebug() << "STRmap already contains" << date.toString("yyyy-MM-dd") << "for" << STRmap[date].days << "ending" << date.addDays(STRmap[date].days-1);
qDebug() << filename.section("/",-2,-1) << "has" << days << "ending" << date.addDays(days-1);
if ( days <= STRmap[date].days ) { if ( days <= STRmap[date].days ) {
qDebug() << "Skipping" << filename.section("/",-2,-1) << "Keeping" << STRmap[date].filename.section("/",-2,-1); qDebug() << "Skipping" << filename.section("/",-2,-1) << "Keeping" << STRmap[date].filename.section("/",-2,-1);
delete stredf; delete stredf;
continue; continue;
} else {
qDebug() << "Dropping" << STRmap[date].filename.section("/", -2, -1) << "Keeping" << filename.section("/",-2,-1);
delete STRmap[date].edf;
STRmap.remove(date); // new one gets added after we know its new name
} }
} }
// now create the new backup name
QString newname = "STR-"+date.toString("yyyyMMdd")+"."+STR_ext_EDF; QString newname = "STR-"+date.toString("yyyyMMdd")+"."+STR_ext_EDF;
QString backupfile = strBackupPath+"/"+newname; QString backupfile = backupPath+"/STR_Backup/"+newname;
QString gzfile = backupfile + STR_ext_gz; QString gzfile = backupfile + STR_ext_gz;
QString nongzfile = backupfile; QString nongzfile = backupfile;
@ -1573,23 +1544,25 @@ 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";
if ( ! QFile::exists(backupfile)) { if ( QFile::exists(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);
} else { // oops, uncompress it to the backup folder } else { // oops, uncompress it to the backup folder
uncompressFile(filename, backupfile); uncompressFile(filename, backupfile);
} }
} else { // file is not compressed } else { // file is not compressed
if (compress_backups) { // so compress it into the backup folder if (compress_backups) { // so compress it into the backup folder
compressFile(filename, backupfile); compressFile(filename, backupfile);
} else { // and that's OK, just copy it over } else { // and that's OK, just copy it over
QFile::copy(filename, backupfile); QFile::copy(filename, backupfile);
}
} }
} }