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] 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<QString, Machine *> 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);