From f0c7cfc991cfffe275d24d8502a8802d053fd6fc Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Thu, 8 Jul 2021 10:32:50 -0700
Subject: [PATCH] Add option to copypath() to overwrite existing files
 copypath() only copies files that do not exist in the destination directory.
 Added an optional parameter that forces copypath() to overwrite existing
 files. This is needed for SleepStyle and DV6 loaders. PRS loader should not
 be affected (it is the only other loader using copypath)

---
 oscar/SleepLib/common.cpp | 7 +++++--
 oscar/SleepLib/common.h   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp
index 55f460b4..3251b815 100644
--- a/oscar/SleepLib/common.cpp
+++ b/oscar/SleepLib/common.cpp
@@ -415,7 +415,7 @@ bool removeDir(const QString &path)
     return result;
 }
 
-void copyPath(QString src, QString dst)
+void copyPath(QString src, QString dst, bool overwrite)
 {
     QDir dir(src);
     if (!dir.exists())
@@ -425,7 +425,7 @@ void copyPath(QString src, QString dst)
     foreach (QString d, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
         QString dst_path = dst + QDir::separator() + d;
         dir.mkpath(dst_path);
-        copyPath(src + QDir::separator() + d, dst_path);
+        copyPath(src + QDir::separator() + d, dst_path, overwrite);
     }
 
     // Files
@@ -433,6 +433,9 @@ void copyPath(QString src, QString dst)
         QString srcFile = src + QDir::separator() + f;
         QString destFile = dst + QDir::separator() + f;
 
+        if (overwrite && QFile::exists(destFile)) {
+            QFile::remove(destFile);
+        }
         if (!QFile::exists(destFile)) {
             if (!QFile::copy(srcFile, destFile)) {
                 qWarning() << "copyPath: could not copy" << srcFile << "to" << destFile;
diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h
index f5f47382..1ef4dee7 100644
--- a/oscar/SleepLib/common.h
+++ b/oscar/SleepLib/common.h
@@ -74,7 +74,7 @@ struct ValueCount {
 
 extern int idealThreads();
 
-void copyPath(QString src, QString dst);
+void copyPath(QString src, QString dst, bool overwrite=false);
 
 
 // Primarily sort by value
@@ -157,6 +157,7 @@ const QString STR_MACH_Journal = "Journal";
 const QString STR_MACH_Intellipap = "Intellipap";
 const QString STR_MACH_Weinmann= "Weinmann";
 const QString STR_MACH_FPIcon = "FPIcon";
+const QString STR_MACH_SleepStyle = "SleepStyle";
 const QString STR_MACH_MSeries = "MSeries";
 const QString STR_MACH_CMS50 = "CMS50";
 const QString STR_MACH_ZEO = "Zeo";