From cd121c319a33c3f15ed83b35644cc27ccced8548 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 3 Jul 2014 11:59:50 +1000 Subject: [PATCH] Force PRS1 purge, don't try to copy when importing from PRS1 backup, warn when switching backups off --- .../SleepLib/loader_plugins/prs1_loader.cpp | 5 +++- .../SleepLib/loader_plugins/prs1_loader.h | 2 +- sleepyhead/SleepLib/profiles.cpp | 24 ++++++++++++++++--- sleepyhead/preferencesdialog.cpp | 11 +++++++++ sleepyhead/preferencesdialog.h | 4 +++- sleepyhead/preferencesdialog.ui | 2 +- 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index a5f19bfd..712bc509 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -392,7 +392,10 @@ int PRS1Loader::OpenMachine(Machine *m, QString path, Profile *profile) return 0; } QString backupPath = p_profile->Get(m->properties[STR_PROP_BackupPath]) + path.section("/", -2); - copyPath(path, backupPath); + + if (dir.absolutePath().compare(QDir(backupPath).absolutePath()) != 0) { + copyPath(path, backupPath); + } dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setSorting(QDir::Name); diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h index 601576b2..970ef325 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h @@ -23,7 +23,7 @@ //******************************************************************************************** // Please INCREMENT the following value when making changes to this loaders implementation. // -const int prs1_data_version = 12; +const int prs1_data_version = 13; // //******************************************************************************************** diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index d21ec35a..c0af501e 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -159,6 +159,14 @@ void showInGraphicalShell(const QString &pathIn) #endif } +int dirCount(QString path) +{ + QDir dir(path); + + QStringList list = dir.entryList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs); + return list.size(); +} + void Profile::DataFormatError(Machine *m) { QString msg; @@ -170,8 +178,9 @@ void Profile::DataFormatError(Machine *m) bool backups = false; if (p_profile->session->backupCardData() && m->properties.contains(STR_PROP_BackupPath)) { - QDir dir(Get(m->properties[STR_PROP_BackupPath])); - if (dir.count() > 0) backups = true; + QString bpath = Get(m->properties[STR_PROP_BackupPath]); + int cnt = dirCount(bpath); + if (cnt > 0) backups = true; } if (backups) { @@ -179,7 +188,7 @@ void Profile::DataFormatError(Machine *m) msg = msg + QObject::tr("Your old machine data should be regenerated provided this backup feature has not been disabled in preferences during a previous data import.") + "

"; backups = true; } else { - msg = msg + QObject::tr("SleepyHead does not yet have an automatic card backup capabilities for this device.") + "

"; + msg = msg + ""+STR_MessageBox_Warning+": "+QObject::tr("SleepyHead does not yet have any automatic card backups stored for this device.") + "

"; msg = msg + QObject::tr("This means you will need to import this machine data again afterwards from your own backups or data card.") + "

"; } @@ -209,6 +218,15 @@ void Profile::DataFormatError(Machine *m) if (backups) { mainwin->importCPAP(Get(m->properties[STR_PROP_BackupPath]), QObject::tr("Rebuilding from %1 Backup").arg(m->properties[STR_PROP_Brand])); } else { + if (!p_profile->session->backupCardData()) { + // Automatic backups not available for Intellipap users yet, so don't taunt them.. + if (m->GetClass() != STR_MACH_Intellipap) { + if (QMessageBox::question(nullptr, STR_MessageBox_Question, QObject::tr("Would you like to switch on automatic backups, so next time a new version of SleepyHead needs to do so, it can rebuild from these?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) { + p_profile->session->setBackupCardData(true); + } + } + } QMessageBox::information(nullptr, STR_MessageBox_Information, QObject::tr("SleepyHead will now start the import wizard so you can reinstall your %1 data.").arg(m->properties[STR_PROP_Brand]) ,QMessageBox::Ok, QMessageBox::Ok); diff --git a/sleepyhead/preferencesdialog.cpp b/sleepyhead/preferencesdialog.cpp index 4802e5e1..305da651 100644 --- a/sleepyhead/preferencesdialog.cpp +++ b/sleepyhead/preferencesdialog.cpp @@ -902,3 +902,14 @@ void PreferencesDialog::on_tooltipTimeoutSlider_valueChanged(int value) { ui->tooltipMS->display(value * 50); } + +void PreferencesDialog::on_createSDBackups_clicked(bool checked) +{ + if (!checked && p_profile->session->backupCardData()) { + if (QMessageBox::question(this, STR_MessageBox_Warning, tr("Switching off automatic backups is not a good idea, because SleepyHead needs these to rebuild the database if errors are found.")+"\n\n"+ + tr("Are you really sure you want to do this?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) { + } else { + ui->createSDBackups->setChecked(true); + } + } +} diff --git a/sleepyhead/preferencesdialog.h b/sleepyhead/preferencesdialog.h index 217f3f2d..dae06f4f 100644 --- a/sleepyhead/preferencesdialog.h +++ b/sleepyhead/preferencesdialog.h @@ -96,7 +96,9 @@ class PreferencesDialog : public QDialog void on_tooltipTimeoutSlider_valueChanged(int value); - private: + void on_createSDBackups_clicked(bool checked); + +private: //! \brief Populates the Graph Model view with data from the Daily, Overview & Oximetry gGraphView objects void resetGraphModel(); diff --git a/sleepyhead/preferencesdialog.ui b/sleepyhead/preferencesdialog.ui index 2f29891c..5e21eff8 100644 --- a/sleepyhead/preferencesdialog.ui +++ b/sleepyhead/preferencesdialog.ui @@ -51,7 +51,7 @@ - 4 + 0