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] 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<QString,QString> & props);