From 13d58003bec98ce646c9676eaa5bdf040b391a35 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 2 Feb 2016 15:02:12 -0800
Subject: [PATCH] migrate persistFilename to persistFilePath in DS settings

---
 .../resources/describe-settings.json          |  2 +-
 .../src/DomainServerSettingsManager.cpp       | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index f024ba5648..f34d7ec8fb 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": 1.1,
   "settings": [
     {
       "name": "metaverse",
diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp
index e10007784f..a0e647ed89 100644
--- a/domain-server/src/DomainServerSettingsManager.cpp
+++ b/domain-server/src/DomainServerSettingsManager.cpp
@@ -124,6 +124,30 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
                 // reload the master and user config so that the merged config is right
                 _configMap.loadMasterAndUserConfig(argumentList);
             }
+        } else if (oldVersion < 1.1) {
+            static const QString ENTITY_FILE_NAME_KEYPATH = "entity_server_settings.persistFilename";
+            static const QString ENTITY_FILE_PATH_KEYPATH = "entity_server_settings.persistFilePath";
+
+            // this was prior to change of poorly named entitiesFileName to entitiesFilePath
+            QVariant* persistFileNameVariant = valueForKeyPath(_configMap.getMergedConfig(), ENTITY_FILE_NAME_KEYPATH);
+            if (persistFileNameVariant && persistFileNameVariant->canConvert(QMetaType::QString)) {
+                QString persistFileName = persistFileNameVariant->toString();
+
+                qDebug() << "Migrating persistFilename to persistFilePath for entity-server settings";
+
+                // grab the persistFilePath option, create it if it doesn't exist
+                QVariant* persistFilePath = valueForKeyPath(_configMap.getUserConfig(), ENTITY_FILE_PATH_KEYPATH, true);
+
+                // write the migrated value
+                *persistFilePath = persistFileName;
+
+                // write the new settings to the json file
+                persistToFile();
+
+                // reload the master and user config so that the merged config is right
+                _configMap.loadMasterAndUserConfig(argumentList);
+            }
+
         }
     }