chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add option to copypath() to overwrite existing files

Browse Source 
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)
This commit is contained in:
Guy Scharf 2021-07-08 10:32:50 -07:00
parent 2ab4e7bbe2
commit f0c7cfc991
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
oscar/SleepLib/common.cpp
View File

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

3
oscar/SleepLib/common.h
View File

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