Workspaces stabilization

src/framework/workspace/internal/workspaceconfiguration.cpp

@@ -25,15 +25,15 @@
 
 #include "global/configreader.h"
 
-#include "workspacetypes.h"
-
 using namespace muse;
 using namespace muse::workspace;
 
 static const muse::Settings::Key CURRENT_WORKSPACE("workspace", "workspace");
 
 void WorkspaceConfiguration::init()
 {
+    fileSystem()->makePath(userWorkspacesPath());
+
     m_config = ConfigReader::read(":/configs/workspaces.cfg");
 
     settings()->setDefaultValue(CURRENT_WORKSPACE, Val(defaultWorkspaceName()));

src/framework/workspace/internal/workspaceconfiguration.h

@@ -27,13 +27,15 @@
 
 #include "modularity/ioc.h"
 #include "iglobalconfiguration.h"
+#include "io/ifilesystem.h"
 
 #include "../iworkspaceconfiguration.h"
 
 namespace muse::workspace {
 class WorkspaceConfiguration : public IWorkspaceConfiguration, public Injectable, public async::Asyncable
 {
     Inject<IGlobalConfiguration> globalConfiguration = { this };
+    Inject<io::IFileSystem> fileSystem = { this };
 
 public:
     WorkspaceConfiguration(const modularity::ContextPtr& iocCtx)

src/framework/workspace/internal/workspacemanager.cpp

@@ -308,16 +308,15 @@ io::paths_t WorkspaceManager::findWorkspaceFiles() const
     };
 
     io::paths_t builtinWorkspacesPaths = configuration()->builtinWorkspacesFilePaths();
-
-    io::paths_t userWorkspacesPaths = findFiles(configuration()->userWorkspacesPath());
-    std::set<io::path_t> userWorkspacesFileNames;
-    for (const io::path_t& dirPath : userWorkspacesPaths) {
-        userWorkspacesFileNames.insert(io::filename(dirPath));
+    std::set<io::path_t> builtinWorkspacesFileNames;
+    for (const io::path_t& dirPath : builtinWorkspacesPaths) {
+        builtinWorkspacesFileNames.insert(io::filename(dirPath));
     }
 
-    muse::remove_if(builtinWorkspacesPaths, [=](const io::path_t& path) -> bool {
+    io::paths_t userWorkspacesPaths = findFiles(configuration()->userWorkspacesPath());
+    muse::remove_if(userWorkspacesPaths, [=](const io::path_t& path) -> bool {
         io::path_t fileName = io::filename(path);
-        return muse::contains(userWorkspacesFileNames, fileName);
+        return muse::contains(builtinWorkspacesFileNames, fileName);
     });
 
     io::paths_t result;

src/framework/workspace/internal/workspaceutils.cpp

@@ -31,5 +31,9 @@ bool WorkspaceUtils::workspaceLessThan(const IWorkspacePtr& workspace1, const IW
         return isWorkspace1Builtin;
     }
 
+    if (isWorkspace1Builtin && isWorkspace2Builtin) {
+        return false;
+    }
+
     return workspace1->name() < workspace2->name();
 }

src/framework/workspace/view/newworkspacemodel.cpp

@@ -25,9 +25,6 @@
 #include "global/translation.h"
 #include "global/io/path.h"
 
-#include "ui/uitypes.h"
-#include "palette/palettetypes.h"
-
 #include "log.h"
 
 using namespace muse::workspace;

src/framework/workspace/workspacetypes.h

@@ -24,7 +24,6 @@
 
 namespace muse::workspace {
 using DataKey = const char*;
-inline constexpr DataKey WS_Undefined("");
 }
 
 #endif // MUSE_WORKSPACE_WORKSPACETYPES_H