From aaaaef0d41de1c4e1fb537818caa706e1a069bbf Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Wed, 4 Mar 2020 15:23:22 -0500 Subject: [PATCH 01/10] Minor updates to the doc files --- oscar/docs/about.html | 2 +- oscar/docs/release_notes.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/oscar/docs/about.html b/oscar/docs/about.html index cd47ab72..686480aa 100644 --- a/oscar/docs/about.html +++ b/oscar/docs/about.html @@ -29,7 +29,7 @@

OSCAR is free (as in freedom) software, released under the GNU Public License v3, and comes with no warranty, and without ANY claims to fitness for any purpose.

-

OSCAR is ©2019 The OSCAR Team: members of the apnea community as listed in the git log

+

OSCAR is ©2019-2020 The OSCAR Team: members of the apnea community as listed in the git log

OSCAR is a derivative of the SleepyHead program which is copyright ©2011-2018 Mark Watkins

diff --git a/oscar/docs/release_notes.html b/oscar/docs/release_notes.html index 5bc7d579..57f74253 100644 --- a/oscar/docs/release_notes.html +++ b/oscar/docs/release_notes.html @@ -13,6 +13,7 @@ Which was written and copyright 2011-2018 © Mark Watkins
  • [new] Add preliminary support for Viatom/Wellue pulse oximeters
  • [new] Ask where to save screenshots
  • [fix] Improved import of Philips Respironics flex and humidification settings
    • +
  • [new]Extensive re-organization of the ResMed loader to facilitate understanding and future improvements
    • From d4fd330a31456cfd86ea6faa349644eab22f80d7 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 8 Mar 2020 16:27:18 -0400 Subject: [PATCH 02/10] Fix regression introduced by cb57643. The Test1/2 channels were no longer initialized. As a result, all Test1/2 data got merged into channel 0. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 3 +++ oscar/SleepLib/schema.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index a8ddff75..a87598ec 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -2713,6 +2713,9 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk) EventList* PRS1Import::GetImportChannel(ChannelID channel) { + if (!channel) { + qCritical() << this->sessionid << "channel in import table has not been added to schema!"; + } EventList* C = m_importChannels[channel]; if (C == nullptr) { C = session->AddEventList(channel, EVL_Event); diff --git a/oscar/SleepLib/schema.cpp b/oscar/SleepLib/schema.cpp index e31cc165..69f5bc1e 100644 --- a/oscar/SleepLib/schema.cpp +++ b/oscar/SleepLib/schema.cpp @@ -338,8 +338,8 @@ void init() // // -// schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test1 = 0x111e, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan1, QObject::tr("Debugging channel #1"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #1"), QString(), INTEGER, QColor("pink"))); -// schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test2 = 0x111f, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan2, QObject::tr("Debugging channel #2"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #2"), QString(), INTEGER, Qt::blue)); + schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test1 = 0x111e, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan1, QObject::tr("Debugging channel #1"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #1"), QString(), INTEGER, QColor("pink"))); + schema::channel.add(GRP_CPAP, ch=new Channel(CPAP_Test2 = 0x111f, DATA, MT_CPAP, SESSION, STR_GRAPH_TestChan2, QObject::tr("Debugging channel #2"), QObject::tr("Top secret internal stuff you're not supposed to see ;)"), QObject::tr("Test #2"), QString(), INTEGER, Qt::blue)); RMS9_E01 = schema::channel["RMS9_E01"].id(); RMS9_E02 = schema::channel["RMS9_E02"].id(); From 53525a79495246922e9e8e27a9609664666ce0c3 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 8 Mar 2020 20:58:36 -0400 Subject: [PATCH 03/10] Refactor PRS1 test card scanning in preparation for unifying with loader. This splits out scanning the directories from processing them, which also allows for sorting. --- oscar/tests/prs1tests.cpp | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp index 6b80291b..28cb6d71 100644 --- a/oscar/tests/prs1tests.cpp +++ b/oscar/tests/prs1tests.cpp @@ -395,32 +395,46 @@ void iterateTestCards(const QString & root, void (*action)(const QString &)) QFileInfoList flist = dir.entryInfoList(); // Look through each folder in the given root - for (int i = 0; i < flist.size(); i++) { - QFileInfo fi = flist.at(i); + for (auto & fi : flist) { if (fi.isDir()) { // If it contains a P-Series folder, it's a PRS1 SD card QDir pseries(fi.canonicalFilePath() + QDir::separator() + "P-Series"); + if (!pseries.exists()) { + // Check for the all-caps version in case this is on a case-sensitive filesystem. + pseries = QDir(fi.canonicalFilePath() + QDir::separator() + "P-SERIES"); + } if (pseries.exists()) { pseries.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); pseries.setSorting(QDir::Name); QFileInfoList plist = pseries.entryInfoList(); // Look for machine directories (containing a PROP.TXT or properties.txt) - for (int j = 0; j < plist.size(); j++) { - QFileInfo pfi = plist.at(j); + QFileInfoList propertyfiles; + for (auto & pfi : plist) { if (pfi.isDir()) { QString machinePath = pfi.canonicalFilePath(); QDir machineDir(machinePath); QFileInfoList mlist = machineDir.entryInfoList(); - for (int k = 0; k < mlist.size(); k++) { - QFileInfo mfi = mlist.at(k); + for (auto & mfi : mlist) { if (QDir::match("PROP*.TXT", mfi.fileName())) { // Found a properties file, this is a machine folder - action(machinePath); + propertyfiles.append(mfi); } } } } + + // Sort machines from oldest to newest. + std::sort(propertyfiles.begin(), propertyfiles.end(), + [](const QFileInfo & a, const QFileInfo & b) + { + return a.lastModified() < b.lastModified(); + }); + // Process machine. + for (auto & propertyfile : propertyfiles) { + QString machinePath = propertyfile.canonicalPath(); + action(machinePath); + } } } } From c8520c8449733f61294e23da128f70f42e59d8f6 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 10:28:34 -0400 Subject: [PATCH 04/10] Move PRS1 test card scanning into PRS1Loader. Also reverse the chronological order of tests to provide the most complete output. The loader itself doesn't yet use the new machine scanner. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 48 ++++++++++++++++++ oscar/SleepLib/loader_plugins/prs1_loader.h | 3 ++ oscar/tests/prs1tests.cpp | 50 +++++-------------- 3 files changed, 64 insertions(+), 37 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index a87598ec..23ab9a99 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -470,6 +470,54 @@ QString PRS1Loader::checkDir(const QString & path) return machpath; } + +QStringList PRS1Loader::FindMachinesOnCard(const QString & cardPath) +{ + QStringList machinePaths; + + // If it contains a P-Series folder, it's a PRS1 SD card + QDir pseries(cardPath + QDir::separator() + "P-Series"); + if (!pseries.exists()) { + // Check for the all-caps version in case this is on a case-sensitive filesystem. + pseries = QDir(cardPath + QDir::separator() + "P-SERIES"); + } + if (pseries.exists()) { + pseries.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); + pseries.setSorting(QDir::Name); + QFileInfoList plist = pseries.entryInfoList(); + + // Look for machine directories (containing a PROP.TXT or properties.txt) + QFileInfoList propertyfiles; + for (auto & pfi : plist) { + if (pfi.isDir()) { + QString machinePath = pfi.canonicalFilePath(); + QDir machineDir(machinePath); + QFileInfoList mlist = machineDir.entryInfoList(); + for (auto & mfi : mlist) { + if (QDir::match("PROP*.TXT", mfi.fileName())) { + // Found a properties file, this is a machine folder + propertyfiles.append(mfi); + } + } + } + } + + // Sort machines from oldest to newest. + std::sort(propertyfiles.begin(), propertyfiles.end(), + [](const QFileInfo & a, const QFileInfo & b) + { + return a.lastModified() < b.lastModified(); + }); + + for (auto & propertyfile : propertyfiles) { + machinePaths.append(propertyfile.canonicalPath()); + } + } + + return machinePaths; +} + + void parseModel(MachineInfo & info, const QString & modelnum) { info.modelnumber = modelnum; diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index 6b634af7..27f08bac 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -444,6 +444,9 @@ class PRS1Loader : public CPAPLoader QString last; QHash PRS1List; + //! \brief Returns the path for each machine detected on an SD card, from oldest to newest + QStringList FindMachinesOnCard(const QString & cardPath); + //! \brief Opens the SD folder structure for this machine, scans for data files and imports any new sessions int OpenMachine(const QString & path); diff --git a/oscar/tests/prs1tests.cpp b/oscar/tests/prs1tests.cpp index 28cb6d71..806b16b0 100644 --- a/oscar/tests/prs1tests.cpp +++ b/oscar/tests/prs1tests.cpp @@ -397,44 +397,20 @@ void iterateTestCards(const QString & root, void (*action)(const QString &)) // Look through each folder in the given root for (auto & fi : flist) { if (fi.isDir()) { - // If it contains a P-Series folder, it's a PRS1 SD card - QDir pseries(fi.canonicalFilePath() + QDir::separator() + "P-Series"); - if (!pseries.exists()) { - // Check for the all-caps version in case this is on a case-sensitive filesystem. - pseries = QDir(fi.canonicalFilePath() + QDir::separator() + "P-SERIES"); - } - if (pseries.exists()) { - pseries.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); - pseries.setSorting(QDir::Name); - QFileInfoList plist = pseries.entryInfoList(); + QStringList machinePaths = s_loader->FindMachinesOnCard(fi.canonicalFilePath()); - // Look for machine directories (containing a PROP.TXT or properties.txt) - QFileInfoList propertyfiles; - for (auto & pfi : plist) { - if (pfi.isDir()) { - QString machinePath = pfi.canonicalFilePath(); - QDir machineDir(machinePath); - QFileInfoList mlist = machineDir.entryInfoList(); - for (auto & mfi : mlist) { - if (QDir::match("PROP*.TXT", mfi.fileName())) { - // Found a properties file, this is a machine folder - propertyfiles.append(mfi); - } - } - } - } - - // Sort machines from oldest to newest. - std::sort(propertyfiles.begin(), propertyfiles.end(), - [](const QFileInfo & a, const QFileInfo & b) - { - return a.lastModified() < b.lastModified(); - }); - // Process machine. - for (auto & propertyfile : propertyfiles) { - QString machinePath = propertyfile.canonicalPath(); - action(machinePath); - } + // Tests should be run newest to oldest, since older sets tend to have more + // complete data. (These are usually previously cleared data in the Clear0/Cn + // directories.) The machines themselves will write out the summary data they + // remember when they see an empty folder, without event or waveform data. + // And since these tests (by design) overwrite existing output, we want the + // earlier (more complete) data to be what's written last. + // + // Since the loader itself keeps only the first set of data it sees for a session, + // we want to leave its earliest-to-latest ordering in place, and just reverse it + // here. + for (auto i = machinePaths.crbegin(); i != machinePaths.crend(); i++) { + action(*i); } } } From 485be366aaed3a4b79ba91806f2daa02d4350a72 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 10:48:10 -0400 Subject: [PATCH 05/10] Make search for PRS1 "P-Series" folder truly case-insensitive. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 25 ++++++++++++++----- oscar/SleepLib/loader_plugins/prs1_loader.h | 3 +++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 23ab9a99..3c4a65c4 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -470,18 +470,31 @@ QString PRS1Loader::checkDir(const QString & path) return machpath; } +QString PRS1Loader::GetPSeriesPath(const QString & path) +{ + QString outpath = ""; + QDir root(path); + QStringList dirs = root.entryList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks); + for (auto & dir : dirs) { + // We've seen P-Series, P-SERIES, and p-series, so we need to search for the directory + // in a way that won't break on a case-sensitive filesystem. + if (dir.toUpper() == "P-SERIES") { + outpath = path + QDir::separator() + dir; + break; + } + } + return outpath; +} QStringList PRS1Loader::FindMachinesOnCard(const QString & cardPath) { QStringList machinePaths; + QString pseriesPath = this->GetPSeriesPath(cardPath); + QDir pseries(pseriesPath); + // If it contains a P-Series folder, it's a PRS1 SD card - QDir pseries(cardPath + QDir::separator() + "P-Series"); - if (!pseries.exists()) { - // Check for the all-caps version in case this is on a case-sensitive filesystem. - pseries = QDir(cardPath + QDir::separator() + "P-SERIES"); - } - if (pseries.exists()) { + if (!pseriesPath.isEmpty() && pseries.exists()) { pseries.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); pseries.setSorting(QDir::Name); QFileInfoList plist = pseries.entryInfoList(); diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index 27f08bac..9ba18a14 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -444,6 +444,9 @@ class PRS1Loader : public CPAPLoader QString last; QHash PRS1List; + //! \brief Returns the path of the P-Series folder (whatever case) if present on the card + QString GetPSeriesPath(const QString & path); + //! \brief Returns the path for each machine detected on an SD card, from oldest to newest QStringList FindMachinesOnCard(const QString & cardPath); From 0124cdbf1f3c6a4fea26e01c74bd052c88ab4139 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 11:17:59 -0400 Subject: [PATCH 06/10] Move PRS1 card detection and info presentation to the new scanner. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 75 +++---------------- oscar/SleepLib/loader_plugins/prs1_loader.h | 3 - 2 files changed, 11 insertions(+), 67 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 3c4a65c4..b7b630e0 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -408,66 +408,8 @@ const QString PR_STR_PSeries = "P-Series"; // Tests path to see if it has (what looks like) a valid PRS1 folder structure bool PRS1Loader::Detect(const QString & path) { - QString newpath = checkDir(path); - - return !newpath.isEmpty(); -} - - -QString PRS1Loader::checkDir(const QString & path) -{ - QString newpath = path; - - newpath.replace("\\", "/"); - - if (!newpath.endsWith("/" + PR_STR_PSeries)) { - newpath = path + "/" + PR_STR_PSeries; - } - - QDir dir(newpath); - - if ((!dir.exists() || !dir.isReadable())) { - return QString(); - } - qDebug() << "PRS1Loader::Detect path=" << newpath; - - QFile lastfile(newpath+"/last.txt"); - - bool exists = true; - if (!lastfile.exists()) { - lastfile.setFileName(newpath+"/LAST.TXT"); - if (!lastfile.exists()) - exists = false; - } - - QString machpath; - if (exists) { - if (!lastfile.open(QIODevice::ReadOnly)) { - qDebug() << "PRS1Loader: last.txt exists but I couldn't open it!"; - } else { - QTextStream ts(&lastfile); - QString serial = ts.readLine(64).trimmed(); - lastfile.close(); - - machpath = newpath+"/"+serial; - - if (!QDir(machpath).exists()) { - machpath = QString(); - } - } - } - - if (machpath.isEmpty()) { - QDir dir(newpath); - QStringList dirs = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs); - if (dirs.size() > 0) { - machpath = dir.cleanPath(newpath+"/"+dirs[0]); - - } - } - - - return machpath; + QStringList machines = FindMachinesOnCard(path); + return !machines.isEmpty(); } QString PRS1Loader::GetPSeriesPath(const QString & path) @@ -644,13 +586,15 @@ bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Ma MachineInfo PRS1Loader::PeekInfo(const QString & path) { - QString newpath = checkDir(path); - if (newpath.isEmpty()) + QStringList machines = FindMachinesOnCard(path); + if (machines.isEmpty()) { return MachineInfo(); + } + // Present information about the newest machine on the card. + QString newpath = machines.last(); + MachineInfo info = newInfo(); - info.serial = newpath.section("/", -1); - if (!PeekProperties(info, newpath+"/properties.txt")) { PeekProperties(info, newpath+"/PROP.TXT"); } @@ -970,6 +914,9 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin // Scan for individual session files for (int i = 0; i < flist.size(); i++) { +#ifndef UNITTEST_MODE + QCoreApplication::processEvents(); +#endif if (isAborted()) { qDebug() << "received abort signal"; break; diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index 9ba18a14..39f0c885 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -387,9 +387,6 @@ class PRS1Loader : public CPAPLoader PRS1Loader(); virtual ~PRS1Loader(); - //! \brief Examine path and return it back if it contains what looks to be a valid PRS1 SD card structure - QString checkDir(const QString & path); - //! \brief Peek into PROP.TXT or properties.txt at given path, and return it as a normalized key/value hash bool PeekProperties(const QString & filename, QHash & props); From 910be1f6af9ac053d051cc832b58e91b8af9b0ed Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 12:47:54 -0400 Subject: [PATCH 07/10] Move PRS1Loader::Open to use the new scanner. Also update Detect to retain its original behavior of letting the user select the P-Series folder instead of the root. Also fix what looked like a hang when backing up PRS1 files. The progress bar still doesn't update during backup, but at least it now says that it's backing up and the UI remains responsive. --- oscar/SleepLib/common.cpp | 6 ++ oscar/SleepLib/loader_plugins/prs1_loader.cpp | 88 +++++-------------- 2 files changed, 30 insertions(+), 64 deletions(-) diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index 0fe56dc2..457744e9 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -394,6 +394,12 @@ void copyPath(QString src, QString dst) if (!QFile::exists(destFile)) { QFile::copy(srcFile, destFile); + // TODO: Since copyPath is only used by loaders, it should + // build the list of files first, and then update the progress bar + // while copying. + // TODO: copyPath should also either hide the abort button + // or respond to it. + QCoreApplication::processEvents(); } } } diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index b7b630e0..be38a12b 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -402,12 +402,18 @@ bool isdigit(QChar c) return false; } -const QString PR_STR_PSeries = "P-Series"; - // Tests path to see if it has (what looks like) a valid PRS1 folder structure -bool PRS1Loader::Detect(const QString & path) +// This is used both to detect newly inserted media and to decide which loader +// to use after the user selects a folder. +bool PRS1Loader::Detect(const QString & selectedPath) { + QString path = selectedPath; + if (GetPSeriesPath(path).isEmpty()) { + // Try up one level in case the user selected the P-Series folder within the SD card. + path = QFileInfo(path).canonicalPath(); + } + QStringList machines = FindMachinesOnCard(path); return !machines.isEmpty(); } @@ -602,75 +608,26 @@ MachineInfo PRS1Loader::PeekInfo(const QString & path) } -int PRS1Loader::Open(const QString & dirpath) +int PRS1Loader::Open(const QString & selectedPath) { - QString newpath; - QString path(dirpath); - path = path.replace("\\", "/"); - - if (path.endsWith("/" + PR_STR_PSeries)) { - newpath = path; - } else { - newpath = path + "/" + PR_STR_PSeries; + QString path = selectedPath; + if (GetPSeriesPath(path).isEmpty()) { + // Try up one level in case the user selected the P-Series folder within the SD card. + path = QFileInfo(path).canonicalPath(); } - qDebug() << "PRS1Loader::Open path=" << newpath; - - QDir dir(newpath); - - if ((!dir.exists() || !dir.isReadable())) { + QStringList machines = FindMachinesOnCard(path); + // Return an error if no machines were found. + if (machines.isEmpty()) { + qDebug() << "No PRS1 machines found at" << path; return -1; } - dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); - dir.setSorting(QDir::Name); - QFileInfoList flist = dir.entryInfoList(); - - QStringList SerialNumbers; - QStringList::iterator sn; - - for (int i = 0; i < flist.size(); i++) { - QFileInfo fi = flist.at(i); - QString filename = fi.fileName(); - - if (fi.isDir() && (filename.size() > 4) && (isdigit(filename[1])) && (isdigit(filename[2]))) { - SerialNumbers.push_back(filename); - } else if (filename.toLower() == "last.txt") { // last.txt points to the current serial number - QString file = fi.canonicalFilePath(); - QFile f(file); - - if (!fi.isReadable()) { - qDebug() << "PRS1Loader: last.txt exists but I couldn't read it!"; - continue; - } - - if (!f.open(QIODevice::ReadOnly)) { - qDebug() << "PRS1Loader: last.txt exists but I couldn't open it!"; - continue; - } - - last = f.readLine(64); - last = last.trimmed(); - f.close(); - } - } - - if (SerialNumbers.empty()) { return -1; } - + // Import each machine, from oldest to newest. int c = 0; - - for (sn = SerialNumbers.begin(); sn != SerialNumbers.end(); sn++) { - if ((*sn)[0].isLetter()) { - c += OpenMachine(newpath + "/" + *sn); - } + for (auto & machinePath : machines) { + c += OpenMachine(machinePath); } - // Serial numbers that don't start with a letter. - for (sn = SerialNumbers.begin(); sn != SerialNumbers.end(); sn++) { - if (!(*sn)[0].isLetter()) { - c += OpenMachine(newpath + "/" + *sn); - } - } - return c; } @@ -705,6 +662,9 @@ int PRS1Loader::OpenMachine(const QString & path) return -1; } + emit updateMessage(QObject::tr("Backing Up Files...")); + QCoreApplication::processEvents(); + QString backupPath = m->getBackupPath() + path.section("/", -2); if (QDir::cleanPath(path).compare(QDir::cleanPath(backupPath)) != 0) { From a9b16f26bdc5eda71f804e9f1e8cc42d83878d35 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 13:03:28 -0400 Subject: [PATCH 08/10] Add an error message to PRS1 loader. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index be38a12b..9ac7506e 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -406,6 +406,12 @@ bool isdigit(QChar c) // Tests path to see if it has (what looks like) a valid PRS1 folder structure // This is used both to detect newly inserted media and to decide which loader // to use after the user selects a folder. +// +// TODO: Ideally there should be a way to handle the two scenarios slightly +// differently. In the latter case, it should clean up the selection and +// return the canonical path if it detects one, allowing us to remove the +// notification about selecting the root of the card. That kind of cleanup +// wouldn't be appropriate when scanning devices. bool PRS1Loader::Detect(const QString & selectedPath) { QString path = selectedPath; @@ -602,7 +608,9 @@ MachineInfo PRS1Loader::PeekInfo(const QString & path) MachineInfo info = newInfo(); if (!PeekProperties(info, newpath+"/properties.txt")) { - PeekProperties(info, newpath+"/PROP.TXT"); + if (!PeekProperties(info, newpath+"/PROP.TXT")) { + qWarning() << "No properties file found in" << newpath; + } } return info; } From c92ef13e194fb014acacadb476cd14bbae93e32b Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 13:13:33 -0400 Subject: [PATCH 09/10] Add F0V2 variant of 451P to list of tested PRS1 machines. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 9ac7506e..69f79ff6 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -238,6 +238,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = { // This first set says "(Philips Respironics)" intead of "(System One)" on official reports. { "251P", 0, 2, "REMstar Plus (System One)" }, // (brick) { "450P", 0, 3, "REMstar Pro (System One)" }, + { "451P", 0, 2, "REMstar Pro (System One)" }, { "451P", 0, 3, "REMstar Pro (System One)" }, { "550P", 0, 2, "REMstar Auto (System One)" }, { "550P", 0, 3, "REMstar Auto (System One)" }, From bc62fce130c90d7aebca87eba3952104088182e5 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Mon, 9 Mar 2020 13:57:43 -0400 Subject: [PATCH 10/10] Refine PRS1 untested data warning based on new sample data. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 69f79ff6..88d21958 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -5366,8 +5366,9 @@ bool PRS1DataChunk::ParseSummaryF3V6(void) qWarning() << this->sessionid << "summary data too short:" << chunk_size; return false; } - // We've once seen a short summary with no mask-on/off: just equipment-on, settings, 9, equipment-off - if (chunk_size < 75) UNEXPECTED_VALUE(chunk_size, ">= 75"); + // We've once seen a short summary with no mask-on/off: just equipment-on, settings, 2, equipment-off + // (And we've seen something similar in F5V3.) + if (chunk_size < 58) UNEXPECTED_VALUE(chunk_size, ">= 58"); bool ok = true; int pos = 0; @@ -6991,6 +6992,7 @@ bool PRS1DataChunk::ParseSummaryF5V3(void) return false; } // We've once seen a short summary with no mask-on/off: just equipment-on, settings, 9, equipment-off + // (And we've seen something similar in F3V6.) if (chunk_size < 75) UNEXPECTED_VALUE(chunk_size, ">= 75"); bool ok = true;