Add migration of old plugin directories to new profile way.

Author: hsorby

src/mapclient/core/mainapplication.py

@@ -29,6 +29,7 @@
 from mapclient.core.checks import runChecks
 from mapclient.settings.definitions import CHECK_TOOLS_ON_STARTUP, RECENTS_LENGTH
 from mapclient.settings.general import get_settings
+from mapclient.settings.version import __version__ as version
 
 logger = logging.getLogger(__name__)
 
@@ -91,6 +92,9 @@ def doEnvironmentChecks(self):
 
     def writeSettings(self):
         settings = get_settings()
+        settings.beginGroup('Application')
+        settings.setValue('version', version)
+        settings.endGroup()
         settings.beginGroup('MainWindow')
         settings.setValue('size', self._size)
         settings.setValue('pos', self._pos)
@@ -109,6 +113,9 @@ def writeSettings(self):
 
     def readSettings(self):
         settings = get_settings()
+        settings.beginGroup('Application')
+        settings_version = settings.value('version', '0.0.0')
+        settings.endGroup()
         settings.beginGroup('MainWindow')
         self._size = settings.value('size', self._size)
         self._pos = settings.value('pos', self._pos)
@@ -120,7 +127,7 @@ def readSettings(self):
         settings.endArray()
         settings.endGroup()
 
-        self._pluginManager.readSettings(settings)
+        self._pluginManager.readSettings(settings, settings_version)
         self._workflowManager.readSettings(settings)
         self._optionsManager.readSettings(settings)
         self._package_manager.read_settings(settings)

src/mapclient/core/managers/pluginmanager.py

@@ -342,24 +342,33 @@ def profile_directories(self):
         """
         return self._profile_directories
 
-    def readSettings(self, settings):
+    def readSettings(self, settings, settings_version):
         self._profile_directories = {}
         settings.beginGroup('Plugins')
         self._doNotShowPluginErrors = settings.value('donot_show_plugin_errors', 'true') == 'true'
         self._virtualenv_setup_attempted = settings.value('virtualenv_setup_attempted', 'false') == 'true'
         self._current_profile = settings.value(_get_app_profile_key(), CONST_DEFAULT_PROFILE)
-        profiles_count = settings.beginReadArray('profiles')
-        for i in range(profiles_count):
-            settings.setArrayIndex(i)
-            profile_name = settings.value('name')
+        if settings_version == '0.0.0':
             directory_count = settings.beginReadArray('directories')
             directories = []
-            for j in range(directory_count):
-                settings.setArrayIndex(j)
+            for i in range(directory_count):
+                settings.setArrayIndex(i)
                 directories.append(settings.value('directory'))
             settings.endArray()
-            self._profile_directories[profile_name] = directories
-        settings.endArray()
+            self._profile_directories[CONST_DEFAULT_PROFILE] = directories
+        else:
+            profiles_count = settings.beginReadArray('profiles')
+            for i in range(profiles_count):
+                settings.setArrayIndex(i)
+                profile_name = settings.value('name')
+                directory_count = settings.beginReadArray('directories')
+                directories = []
+                for j in range(directory_count):
+                    settings.setArrayIndex(j)
+                    directories.append(settings.value('directory'))
+                settings.endArray()
+                self._profile_directories[profile_name] = directories
+            settings.endArray()
         settings.endGroup()
         self._profile_directories[CONST_DEFAULT_PROFILE] = self._profile_directories.get(CONST_DEFAULT_PROFILE, [])
         settings.beginGroup('Ignored Plugins')