exch:uavos#40 config versioning

DashMok02 · Mar 5, 2024 · ac2f253 · ac2f253
1 parent 28519db
commit ac2f253
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/lib/ApxCore/App/AppBase.cpp b/src/lib/ApxCore/App/AppBase.cpp
@@ -67,6 +67,7 @@ AppBase::AppBase(int &argc, char **argv, const QString &name)
 
     QSettings::setDefaultFormat(QSettings::IniFormat);
     //prefs
+    m_version = VERSION;
     QDir prefs_dir(AppDirs::prefs());
     if (!prefs_dir.exists())
         prefs_dir.mkpath(".");
@@ -75,7 +76,7 @@ AppBase::AppBase(int &argc, char **argv, const QString &name)
     QApplication::setWindowIcon(QIcon("qrc:///icons/uavos-logo.icns"));
 
     // app constants
-    m_version = VERSION;
+
     apxConsole() << tr("Version").append(":") << m_version;
 
     m_hash = GIT_HASH;

diff --git a/src/lib/ApxCore/App/AppDirs.cpp b/src/lib/ApxCore/App/AppDirs.cpp
@@ -19,7 +19,9 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "AppDirs.h"
+#include "AppBase.h"
 
 #include <app_def.h>
 
@@ -54,8 +56,17 @@ QDir AppDirs::user()
 #ifdef __ANDROID__
     return QDir(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/.gcu");
 #else
+    qsizetype macro_version = 0;
+    QString ver = AppBase::version();
+    for (qsizetype i = 0; i < ver.size(); ++i) {
+        if (ver.at(i) == ".") {
+            macro_version = i;
+            break;
+        }
+    }
+    ver.truncate(macro_version);
     return QDir(QDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation))
-                    .absoluteFilePath("UAVOS"));
+                    .absoluteFilePath("UAVOS-" + ver));
 #endif
 }