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

@@ -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;

oscar/SleepLib/loader_plugins/prs1_loader.h

@@ -444,6 +444,9 @@ class PRS1Loader : public CPAPLoader
     QString last;
     QHash<QString, Machine *> 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);
 

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
+            QStringList machinePaths = s_loader->FindMachinesOnCard(fi.canonicalFilePath());
-            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)
+            // Tests should be run newest to oldest, since older sets tend to have more
-                QFileInfoList propertyfiles;
+            // complete data. (These are usually previously cleared data in the Clear0/Cn
-                for (auto & pfi : plist) {
+            // directories.) The machines themselves will write out the summary data they
-                    if (pfi.isDir()) {
+            // remember when they see an empty folder, without event or waveform data.
-                        QString machinePath = pfi.canonicalFilePath();
+            // And since these tests (by design) overwrite existing output, we want the
-                        QDir machineDir(machinePath);
+            // earlier (more complete) data to be what's written last.
-                        QFileInfoList mlist = machineDir.entryInfoList();
+            //
-                        for (auto & mfi : mlist) {
+            // Since the loader itself keeps only the first set of data it sees for a session,
-                            if (QDir::match("PROP*.TXT", mfi.fileName())) {
+            // we want to leave its earliest-to-latest ordering in place, and just reverse it
-                                // Found a properties file, this is a machine folder
+            // here.
-                                propertyfiles.append(mfi);
+            for (auto i = machinePaths.crbegin(); i != machinePaths.crend(); i++) {
-                            }
+                action(*i);
-                        }
-                    }
-                }
-
-                // 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);
-                }
             }
         }
     }