Merge branch 'main' of github.com:MusculoskeletalAtlasProject/mapclient

Author: hsorby

res/win/nsis.nsi

@@ -4,7 +4,7 @@
 ; You must define these values
 
   !define APP_NAME "MAP-Client"
-  !define APP_VERSION "0.14.0"
+  !define APP_VERSION "0.25.0"
   !define APP_ORGANISATION "MAP"
   !define VERSION "1.0.0"
   !define PATCH  "1"
@@ -742,7 +742,7 @@ Section "-Core installation"
 
   ; Optional registration
   Push "DisplayIcon"
-  Push "$INSTDIR\"
+  Push "$INSTDIR\${APP_NAME},0"
   Call ConditionalAddToRegisty
   Push "HelpLink"
   Push ""

res/win/nsis.nsi.template

@@ -119,7 +119,8 @@ Section
 
     ; Write uninstall information to registry.
     !insertmacro WriteUninstallInfo "DisplayName" "${APP_NAME} ${APP_VERSION}"
-    !insertmacro WriteUninstallInfo "DisplayVersion" "${INSTALLER_VERSION}"
+    !insertmacro WriteUninstallInfo "DisplayIcon" "$INSTDIR\${APP_NAME}.exe,0"
+    !insertmacro WriteUninstallInfo "DisplayVersion" "${APP_VERSION}"
     !insertmacro WriteUninstallInfo "Publisher" "${APP_ORGANISATION}"
     !insertmacro WriteUninstallInfo "UninstallString" "$INSTDIR\Uninstall.exe"
     !insertmacro WriteUninstallInfo "NoRepair" "1"

src/mapclient/application.py

@@ -19,6 +19,7 @@
     along with MAP Client.  If not, see <http://www.gnu.org/licenses/>..
 """
 import json
+import multiprocessing
 import os
 import shutil
 import sys
@@ -55,6 +56,15 @@
 logger = logging.getLogger('mapclient.application')
 
 
+def get_app_path():
+    if getattr(sys, 'frozen', False):
+        # If the application is frozen (e.g., by PyInstaller)
+        return os.path.dirname(sys.executable)
+    else:
+        # If running in a normal Python environment
+        return os.path.dirname(os.path.abspath(__file__))
+
+
 def initialise_logger(log_path):
     """
     Initialise logger settings and information formatting
@@ -375,7 +385,7 @@ def _user_specified_environment_main(base_dir, directories):
             if os.path.isdir(d) and d not in plugin_directories:
                 plugin_directories.append(d)
 
-        pm.setDirectories(plugin_directories)
+        pm.set_directories(plugin_directories)
         model.writeSettings()
 
     logger.info(f"Set environment variable '{APPLICATION_ENVIRONMENT_CONFIG_DIR_VARIABLE}' to '{config_dir}' to use application with these settings.")
@@ -525,4 +535,5 @@ def main():
 
 
 if __name__ == '__main__':
+    multiprocessing.freeze_support()
     main()

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/optionsmanager.py

@@ -7,14 +7,16 @@
 from mapclient.settings.general import get_virtualenv_directory
 from mapclient.settings.definitions import SHOW_STEP_NAMES, CLOSE_AFTER, METRICS_PERMISSION, INTERNAL_EXE, UNSET_FLAG, \
     DONT_CREATE_VIRTUAL_ENV, OPTIONS_SETTINGS_TAG, INTERNAL_WORKFLOWS_AVAILABLE, INTERNAL_WORKFLOW_DIR, VIRTUAL_ENV_PATH, \
-    GIT_EXE, PYSIDE_UIC_EXE, PYSIDE_RCC_EXE, PREVIOUS_PW_WRITE_STEP_LOCATION, PREVIOUS_PW_ICON_LOCATION, CHECK_TOOLS_ON_STARTUP, \
+    GIT_EXE, PYSIDE_UIC_EXE, PYSIDE_RCC_EXE, PREVIOUS_PW_WRITE_STEP_LOCATION, PREVIOUS_PW_ICON_LOCATION, \
+    CHECK_TOOLS_ON_STARTUP, \
     USE_EXTERNAL_GIT, USE_EXTERNAL_RCC, USE_EXTERNAL_UIC, RECENTS_ABSOLUTE_PATHS, RECENTS_LENGTH, PREVIOUS_WORKFLOW, \
-    AUTOLOAD_PREVIOUS_WORKFLOW, METRICS_PERMISSION_ATTAINED
+    AUTOLOAD_PREVIOUS_WORKFLOW, METRICS_PERMISSION_ATTAINED, ANIMATE_LAYOUT_UPDATES
 
 
 def _is_boolean(option):
     return option in [SHOW_STEP_NAMES, CHECK_TOOLS_ON_STARTUP, DONT_CREATE_VIRTUAL_ENV, METRICS_PERMISSION, USE_EXTERNAL_GIT,
-                      USE_EXTERNAL_RCC, USE_EXTERNAL_UIC, RECENTS_ABSOLUTE_PATHS, INTERNAL_WORKFLOWS_AVAILABLE, AUTOLOAD_PREVIOUS_WORKFLOW]
+                      USE_EXTERNAL_RCC, USE_EXTERNAL_UIC, RECENTS_ABSOLUTE_PATHS, INTERNAL_WORKFLOWS_AVAILABLE,
+                      AUTOLOAD_PREVIOUS_WORKFLOW, ANIMATE_LAYOUT_UPDATES]
 
 
 def _is_float(option):
@@ -32,6 +34,7 @@ def __init__(self):
         self._options = {
             SHOW_STEP_NAMES: True, CLOSE_AFTER: 2.0, METRICS_PERMISSION: False,
             DONT_CREATE_VIRTUAL_ENV: False, CHECK_TOOLS_ON_STARTUP: True,
+            ANIMATE_LAYOUT_UPDATES: True,
             USE_EXTERNAL_GIT: False, USE_EXTERNAL_RCC: False, USE_EXTERNAL_UIC: False,
             RECENTS_ABSOLUTE_PATHS: False, RECENTS_LENGTH: 10,
             VIRTUAL_ENV_PATH: get_virtualenv_directory(), GIT_EXE: which('git'),

src/mapclient/core/managers/pluginmanager.py

@@ -3,7 +3,6 @@
 
 @author: hsorby
 """
-import io
 import json
 import os
 import sys
@@ -16,37 +15,38 @@
 import types
 import importlib
 
-from contextlib import redirect_stdout
-
-
-from mapclient.core.utils import which, FileTypeObject, grep, is_frozen, determine_step_name, determine_step_class_name
+from mapclient.application import get_app_path
+from mapclient.core.utils import which, FileTypeObject, grep, is_frozen, determine_step_name, determine_step_class_name, \
+    stable_hash
 from mapclient.settings.definitions import VIRTUAL_ENV_PATH, \
     PLUGINS_PACKAGE_NAME, PLUGINS_PTH
 from mapclient.core.checks import getPipExecutable
 
 from importlib import import_module
 
-from mapclient.settings.general import get_virtualenv_site_packages_directory
+from mapclient.settings.general import get_virtualenv_site_packages_directory, get_settings
 
 logger = logging.getLogger(__name__)
 
+CONST_DEFAULT_PROFILE = 'Default'
+
 
 def getVirtualEnvCandidates():
     """Return a list of strings which contains possible names
     of the virtualenv program for this environment.
     """
-    if sys.version_info < (3, 0):
-        virtualenv_candidates = [which('virtualenv'), which('virtualenv2')]
-    else:
-        virtualenv_candidates = [which('virtualenv'), which('virtualenv3')]
+    return [which('virtualenv'), which('virtualenv3')]
 
-    return virtualenv_candidates
+
+def _get_app_profile_key():
+    return f'current_profile_{stable_hash(get_app_path())}'
 
 
 class PluginManager:
 
     def __init__(self):
-        self._directories = []
+        self._current_profile = CONST_DEFAULT_PROFILE
+        self._profile_directories = {}
         self._virtualenv_enabled = True
         self._virtualenv_dir = None
         self._virtualenv_setup_attempted = False
@@ -74,7 +74,13 @@ def getVirtualEnvDirectory(self):
         return self._virtualenv_dir
 
     def directories(self):
-        return self._directories
+        return self._profile_directories.get(self._current_profile, [])
+
+    def current_profile(self):
+        return self._current_profile
+
+    def set_current_profile(self, profile_name):
+        self._current_profile = profile_name
 
     def setReloadPlugins(self, state=True):
         self._reload_plugins = state
@@ -105,14 +111,15 @@ def list(self):
     def setOptions(self, options):
         self._virtualenv_dir = options[VIRTUAL_ENV_PATH]
 
-    def setDirectories(self, directories):
+    def set_directories(self, directories):
         """
         Set the list of directories to be searched for
         plugins.  Returns true if the directories listing
         was updated and false otherwise.
         """
-        if self._directories != directories:
-            self._directories = directories
+        current_directories = self._profile_directories.get(self._current_profile, [])
+        if current_directories != directories:
+            self._profile_directories[self._current_profile] = directories
             self._reload_plugins = True
 
     def virtualenvSetupAttempted(self):
@@ -165,11 +172,6 @@ def setupVirtualEnv(self):
     def getPluginDatabase(self):
         return self._plugin_database
 
-    def allDirectories(self):
-        plugin_dirs = self._directories[:]
-
-        return plugin_dirs
-
     def _addPluginDir(self, directory):
         added = False
         if isMapClientPluginsDir(directory):
@@ -223,7 +225,7 @@ def load(self):
 
         len_package_modules_prior = len(sys.modules[PLUGINS_PACKAGE_NAME].__path__) if PLUGINS_PACKAGE_NAME in sys.modules else 0
         new_plugin_directories = []
-        for directory in self.allDirectories():
+        for directory in self.directories():
             if self._addPluginDir(directory):
                 new_plugin_directories.append(directory)
             else:
@@ -328,17 +330,47 @@ def getPluginErrors(self):
         return {'ImportError': self._import_errors, 'TypeError': self._type_errors, 'SyntaxError': self._syntax_errors, 'TabError': self._tab_errors,
                 'directories': self._plugin_error_directories}
 
-    def readSettings(self, settings):
-        self._directories = []
+    def set_profile_directories(self, profile_directories):
+        """
+        Set the directories for the given profile name.
+        """
+        self._profile_directories = profile_directories
+
+    def profile_directories(self):
+        """
+        Get the profile directories information.
+        """
+        return self._profile_directories
+
+    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'
-        directory_count = settings.beginReadArray('directories')
-        for i in range(directory_count):
-            settings.setArrayIndex(i)
-            self._directories.append(settings.value('directory'))
-        settings.endArray()
+        self._current_profile = settings.value(_get_app_profile_key(), CONST_DEFAULT_PROFILE)
+        if settings_version == '0.0.0':
+            directory_count = settings.beginReadArray('directories')
+            directories = []
+            for i in range(directory_count):
+                settings.setArrayIndex(i)
+                directories.append(settings.value('directory'))
+            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')
         plugin_count = settings.beginReadArray('plugins')
         for i in range(plugin_count):
@@ -371,12 +403,18 @@ def writeSettings(self, settings):
         settings.beginGroup('Plugins')
         settings.setValue('donot_show_plugin_errors', self._doNotShowPluginErrors)
         settings.setValue('virtualenv_setup_attempted', self._virtualenv_setup_attempted)
-        settings.beginWriteArray('directories')
-        directory_index = 0
-        for directory in self._directories:
-            settings.setArrayIndex(directory_index)
-            settings.setValue('directory', directory)
-            directory_index += 1
+        settings.setValue(_get_app_profile_key(), self._current_profile)
+        settings.beginWriteArray('profiles')
+        profile_index = 0
+        for profile_name, profile_directories in self._profile_directories.items():
+            settings.setArrayIndex(profile_index)
+            settings.setValue('name', profile_name)
+            settings.beginWriteArray('directories')
+            for directory_index, directory in enumerate(profile_directories):
+                settings.setArrayIndex(directory_index)
+                settings.setValue('directory', directory)
+            settings.endArray()
+            profile_index += 1
         settings.endArray()
         settings.endGroup()
         settings.beginGroup('Ignored Plugins')
@@ -557,8 +595,8 @@ def checkForMissingPlugins(self, to_check):
         """
         missing_plugins = {}
         for plugin in to_check:
-            if not (plugin in self._database and \
-                    to_check[plugin]['author'] == self._database[plugin]['author'] and \
+            if not (plugin in self._database and
+                    to_check[plugin]['author'] == self._database[plugin]['author'] and
                     to_check[plugin]['version'] == self._database[plugin]['version']):
                 missing_plugins[plugin] = to_check[plugin]
 

src/mapclient/core/managers/workflowmanager.py

@@ -19,6 +19,7 @@
 """
 import os
 import logging
+
 from packaging import version
 
 from PySide6 import QtCore

src/mapclient/core/utils.py

@@ -17,6 +17,7 @@
     You should have received a copy of the GNU General Public License
     along with MAP Client.  If not, see <http://www.gnu.org/licenses/>..
 """
+import hashlib
 import json
 import logging
 import os
@@ -379,3 +380,7 @@ def to_exchangeable_path(input_path):
 
 def to_system_path(input_path):
     return str(PurePath(input_path))
+
+
+def stable_hash(s):
+    return hashlib.sha256(s.encode()).hexdigest()