Save/load relative board path (needed e.g. for AppImage)

ElTh0r0 · Oct 12, 2019 · d7298ce · d7298ce
1 parent 7ba0ad2
commit d7298ce
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/board.cpp b/board.cpp
@@ -29,6 +29,7 @@
 #include <QByteArray>
 #include <QCoreApplication>
 #include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QMessageBox>
 
@@ -497,8 +498,14 @@ void Board::saveGame(const QString &sSaveFile, const QString &sTime,
   QByteArray ba;
   QString sDebug;
 
+  // Save relative board folder, needed e.g. for AppImage
+  QDir dir(qApp->applicationDirPath());
+  QString sRelativeDir;
+  sRelativeDir = dir.relativeFilePath(m_sBoardFile);
+
   saveConf.clear();
   saveConf.setValue(QStringLiteral("BoardFile"), m_sBoardFile);
+  saveConf.setValue(QStringLiteral("BoardFileRelative"), sRelativeDir);
   ba.append(sTime);
   saveConf.setValue(QStringLiteral("ElapsedTime"), ba.toBase64());
   ba.clear();

diff --git a/iqpuzzle.cpp b/iqpuzzle.cpp
@@ -471,18 +471,29 @@ void IQPuzzle::loadGame(QString sSaveFile) {
   if (!sSaveFile.isEmpty()) {
     QSettings tmpSet(sSaveFile, QSettings::IniFormat);
     QString sBoard(tmpSet.value(QStringLiteral("BoardFile"), "").toString());
-    if (!sBoard.isEmpty()) {
-      QByteArray ba(tmpSet.value(
-                      QStringLiteral("NumOfMoves"), "").toByteArray());
-      m_sSavedMoves = QByteArray::fromBase64(ba);
-      ba.clear();
-      ba = tmpSet.value(QStringLiteral("ElapsedTime"), "").toByteArray();
-      m_sSavedTime = QByteArray::fromBase64(ba);
-      this->startNewGame(sBoard, sSaveFile, m_sSavedTime, m_sSavedMoves);
-    } else {
-      QMessageBox::warning(this, qApp->applicationName(),
-                           tr("Invalid saved puzzle."));
+    QString sBoardRel(tmpSet.value(
+                        QStringLiteral("BoardFileRelative"), "").toString());
+    if (sBoard.isEmpty() || !QFile::exists(sBoard)) {
+      if (!sBoardRel.isEmpty() &&
+          QFile::exists(qApp->applicationDirPath() + "/" + sBoardRel)) {
+        sBoard = qApp->applicationDirPath() + "/" + sBoardRel;
+      } else {
+        QMessageBox::warning(this, qApp->applicationName(),
+                             tr("Invalid saved puzzle."));
+        return;
+      }
     }
+
+    QByteArray ba(tmpSet.value(
+                    QStringLiteral("NumOfMoves"), "").toByteArray());
+    m_sSavedMoves = QByteArray::fromBase64(ba);
+    ba.clear();
+    ba = tmpSet.value(QStringLiteral("ElapsedTime"), "").toByteArray();
+    m_sSavedTime = QByteArray::fromBase64(ba);
+    this->startNewGame(sBoard, sSaveFile, m_sSavedTime, m_sSavedMoves);
+  } else {
+    QMessageBox::warning(this, qApp->applicationName(),
+                         tr("Invalid saved puzzle."));
   }
 }