From 22a973659855b2e1862153571b147c7c230b2632 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 29 Apr 2014 05:24:39 +1000
Subject: [PATCH] Intellipap & FP Icon autoscanner Detect() functions

---
 .../SleepLib/loader_plugins/icon_loader.cpp   | 36 +++++++++++++------
 .../loader_plugins/intellipap_loader.cpp      | 20 +++++++++--
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
index a55b309d..bb93d2d3 100644
--- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp
@@ -20,6 +20,8 @@
 
 extern QProgressBar *qprogress;
 
+const QString FPHCARE = "FPHCARE";
+
 FPIcon::FPIcon(Profile *p, MachineID id)
     : CPAP(p, id)
 {
@@ -39,6 +41,28 @@ FPIconLoader::~FPIconLoader()
 {
 }
 
+bool FPIconLoader::Detect(const QString & givenpath)
+{
+    QDir dir(givenpath);
+
+    if (!dir.exists()) {
+        return false;
+    }
+
+    // F&P Icon have a folder called FPHCARE in the root directory
+    if (!dir.exists(FPHCARE)) {
+        return false;
+    }
+
+    // CHECKME: I can't access F&P ICON data right now
+    if (!dir.exists("FPCARE/ICON")) {
+        return false;
+    }
+
+    return true;
+}
+
+
 int FPIconLoader::Open(QString &path, Profile *profile)
 {
     QString newpath;
@@ -49,12 +73,10 @@ int FPIconLoader::Open(QString &path, Profile *profile)
         path.chop(1);
     }
 
-    QString dirtag = "FPHCARE";
-
-    if (path.endsWith("/" + dirtag)) {
+    if (path.endsWith("/" + FPHCARE)) {
         newpath = path;
     } else {
-        newpath = path + "/" + dirtag;
+        newpath = path + "/" + FPHCARE;
     }
 
     newpath += "/ICON/";
@@ -899,12 +921,6 @@ Machine *FPIconLoader::CreateMachine(QString serial, Profile *profile)
     return m;
 }
 
-bool FPIconLoader::Detect(const QString & path)
-{
-    return false;
-}
-
-
 bool fpicon_initialized = false;
 void FPIconLoader::Register()
 {
diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
index 157acc9d..0fb431cc 100644
--- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp
@@ -36,9 +36,25 @@ IntellipapLoader::~IntellipapLoader()
 {
 }
 
-bool IntellipapLoader::Detect(const QString & path)
+bool IntellipapLoader::Detect(const QString & givenpath)
 {
-    return false;
+    QDir dir(givenpath);
+
+    if (!dir.exists()) {
+        return false;
+    }
+
+    // Intellipap has a folder called SL in the root directory
+    if (!dir.cd("SL")) {
+        return false;
+    }
+
+    // Check for the settings file inside the SL folder
+    if (!dir.exists("SET1")) {
+        return false;
+    }
+
+    return true;
 }
 
 int IntellipapLoader::Open(QString &path, Profile *profile)