chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-08 12:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add error checks and messages to migration

Browse Source
This commit is contained in:
Phil Olynyk 2019-03-28 21:24:10 -04:00
parent e9e9033097
commit be2eafb4fd
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
oscar/main.cpp
View File

@ -137,18 +137,39 @@ bool process_a_Profile( QString path ) {
bool migrateFromSH(QString destDir) { bool migrateFromSH(QString destDir) {
QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/"; QString homeDocs = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)+"/";
QString datadir;
bool selectingFolder = true;
bool success = false; bool success = false;
if (destDir.isEmpty()) { if (destDir.isEmpty()) {
qDebug() << "Migration path is empty string"; qDebug() << "Migration path is empty string";
return success; return success;
} }
QString datadir = QFileDialog::getExistingDirectory(nullptr, while (selectingFolder) {
QObject::tr("Choose the SleepyHead data folder to migrate"), homeDocs, QFileDialog::ShowDirsOnly); datadir = QFileDialog::getExistingDirectory(nullptr,
qDebug() << "Migration folder selected: " + datadir; QObject::tr("Choose the SleepyHead data folder to migrate\nor CANCEL to start OSCAR without migrating SleepyHead data."),
if (datadir.isEmpty()) { homeDocs, QFileDialog::ShowDirsOnly);
qDebug() << "No migration source directory selected"; qDebug() << "Migration folder selected: " + datadir;
return false; if (datadir.isEmpty()) {
qDebug() << "No migration source directory selected";
return false;
} else { // We have a folder, see if is a SleepyHead folder
QDir dir(datadir);
QFile file(datadir + "/Preferences.xml");
QDir dirP(datadir + "/Profiles");
if (!file.exists() || !dirP.exists()) { // It doesn't have a Preferences.xml file or a Profiles directory in it
// Not a new directory.. nag the user.
if (QMessageBox::question(nullptr, STR_MessageBox_Warning,
QObject::tr("The folder you chose does not contain valid SleepyHead data.") +
"\n\n"+QObject::tr("You cannot use this folder:")+" " + datadir )) {
continue; // Nope, don't use it, go around the loop again
}
}
qDebug() << "Migration folder is" << datadir;
selectingFolder = false;
}
} }
success = copyRecursively(datadir, destDir); success = copyRecursively(datadir, destDir);
@ -339,8 +360,9 @@ int main(int argc, char *argv[])
} else { // We have a folder, see if is already an OSCAR folder } else { // We have a folder, see if is already an OSCAR folder
QDir dir(datadir); QDir dir(datadir);
QFile file(datadir + "/Preferences.xml"); QFile file(datadir + "/Preferences.xml");
QDir dirP(datadir + "/Profiles");
if (!file.exists()) { // It doesn't have a Preferences.xml file in it if (!file.exists() || !dirP.exists()) { // It doesn't have a Preferences.xml file or a Profiles directory in it
if (dir.count() > 2) { // but it has more than dot and dotdot if (dir.count() > 2) { // but it has more than dot and dotdot
// Not a new directory.. nag the user. // Not a new directory.. nag the user.
if (QMessageBox::question(nullptr, STR_MessageBox_Warning, if (QMessageBox::question(nullptr, STR_MessageBox_Warning,