src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -458,23 +458,19 @@ internal class ProfileService : IProfileService
         if (profileEntry == null)
             throw new ArtemisCoreException("Could not import profile, profile.json missing");
 
-        // Deserialize profile configuration to JObject
         await using Stream configurationStream = configurationEntry.Open();
         using StreamReader configurationReader = new(configurationStream);
-        JObject? configurationJson = JsonConvert.DeserializeObject<JObject>(await configurationReader.ReadToEndAsync(), IProfileService.ExportSettings);
+        ProfileConfigurationEntity? configurationEntity = JsonConvert.DeserializeObject<ProfileConfigurationEntity>(await configurationReader.ReadToEndAsync(), IProfileService.ExportSettings);
-        // Deserialize profile to JObject
+        if (configurationEntity == null)
+            throw new ArtemisCoreException("Could not import profile, failed to deserialize configuration.json");
+
         await using Stream profileStream = profileEntry.Open();
         using StreamReader profileReader = new(profileStream);
         JObject? profileJson = JsonConvert.DeserializeObject<JObject>(await profileReader.ReadToEndAsync(), IProfileService.ExportSettings);
 
         // Before deserializing, apply any pending migrations
-        MigrateProfile(configurationJson, profileJson);
+        MigrateProfile(configurationEntity, profileJson);
 
-        // Deserialize profile configuration to ProfileConfigurationEntity
-        ProfileConfigurationEntity? configurationEntity = configurationJson?.ToObject<ProfileConfigurationEntity>(JsonSerializer.Create(IProfileService.ExportSettings));
-        if (configurationEntity == null)
-            throw new ArtemisCoreException("Could not import profile, failed to deserialize configuration.json");
-        // Deserialize profile to ProfileEntity
         ProfileEntity? profileEntity = profileJson?.ToObject<ProfileEntity>(JsonSerializer.Create(IProfileService.ExportSettings));
         if (profileEntity == null)
             throw new ArtemisCoreException("Could not import profile, failed to deserialize profile.json");
@@ -559,20 +555,18 @@ internal class ProfileService : IProfileService
         }
     }
 
-    private void MigrateProfile(JObject? configurationJson, JObject? profileJson)
+    private void MigrateProfile(ProfileConfigurationEntity configurationEntity, JObject? profileJson)
     {
-        if (configurationJson == null || profileJson == null)
+        if (profileJson == null)
             return;
 
-        configurationJson["Version"] ??= 0;
-        
         foreach (IProfileMigration profileMigrator in _profileMigrators.OrderBy(m => m.Version))
         {
-            if (profileMigrator.Version <= configurationJson["Version"]!.Value<int>())
+            if (profileMigrator.Version <= configurationEntity.Version)
                 continue;
 
-            profileMigrator.Migrate(configurationJson, profileJson);
+            profileMigrator.Migrate(profileJson);
-            configurationJson["Version"] = profileMigrator.Version;
+            configurationEntity.Version = profileMigrator.Version;
         }
     }
 

src/Artemis.Storage/Migrations/IProfileMigration.cs

@@ -5,5 +5,5 @@ namespace Artemis.Storage.Migrations;
 public interface IProfileMigration
 {
     int Version { get; }
-    void Migrate(JObject configurationJson, JObject profileJson);
+    void Migrate(JObject profileJson);
 }

src/Artemis.Storage/Migrations/Profile/M0001NodeProviders.cs

@@ -12,7 +12,7 @@ internal class M0001NodeProviders : IProfileMigration
     public int Version => 1;
 
     /// <inheritdoc />
-    public void Migrate(JObject configurationJson, JObject profileJson)
+    public void Migrate(JObject profileJson)
     {
         JArray? folders = (JArray?) profileJson["Folders"]?["$values"];
         JArray? layers = (JArray?) profileJson["Layers"]?["$values"];

src/Artemis.Storage/Migrations/Profile/M0002NodeProvidersProfileConfig.cs

@@ -1,35 +0,0 @@
-using Newtonsoft.Json.Linq;
-
-namespace Artemis.Storage.Migrations.Profile;
-
-/// <summary>
-/// Migrates nodes to be provider-based on profile configurations as well..
-/// This requires giving them a ProviderId and updating the their namespaces to match the namespace of the new plugin. 
-/// </summary>
-internal class M0002NodeProvidersProfileConfig : IProfileMigration
-{
-    /// <inheritdoc />
-    public int Version => 2;
-
-    /// <inheritdoc />
-    public void Migrate(JObject configurationJson, JObject profileJson)
-    {
-        MigrateNodeScript(configurationJson["ActivationCondition"]);
-    }
-    
-    private void MigrateNodeScript(JToken? nodeScript)
-    {
-        if (nodeScript == null || !nodeScript.HasValues)
-            return;
-
-        JArray? nodes = (JArray?) nodeScript["Nodes"]?["$values"];
-        if (nodes == null)
-            return;
-
-        foreach (JToken node in nodes)
-        {
-            node["Type"] = node["Type"]?.Value<string>()?.Replace("Artemis.VisualScripting.Nodes", "Artemis.Plugins.Nodes.General.Nodes");
-            node["ProviderId"] = "Artemis.Plugins.Nodes.General.GeneralNodesProvider-d9e1ee78";
-        }
-    }
-}

src/Artemis.Storage/Migrations/Storage/M0024NodeProviders.cs

@@ -10,22 +10,17 @@ public class M0024NodeProviders : IStorageMigration
 
     public void Apply(LiteRepository repository)
     {
-        ILiteCollection<BsonDocument> categoryCollection = repository.Database.GetCollection("ProfileCategoryEntity");
+        List<ProfileCategoryEntity> profileCategories = repository.Query<ProfileCategoryEntity>().ToList();
-        List<BsonDocument> categoriesToUpdate = new();
+        foreach (ProfileCategoryEntity profileCategory in profileCategories)
-        foreach (BsonDocument profileCategoryBson in categoryCollection.FindAll())
         {
-            BsonArray? profiles = profileCategoryBson["ProfileConfigurations"]?.AsArray;
+            foreach (ProfileConfigurationEntity profileConfigurationEntity in profileCategory.ProfileConfigurations)
-            if (profiles != null)
             {
-                foreach (BsonValue profile in profiles)
+                profileConfigurationEntity.Version = 1;
-                    profile["Version"] = 1;
-                categoriesToUpdate.Add(profileCategoryBson);
             }
+            repository.Update(profileCategory);
         }
-        categoryCollection.Update(categoriesToUpdate);
 
         ILiteCollection<BsonDocument> collection = repository.Database.GetCollection("ProfileEntity");
-        List<BsonDocument> profilesToUpdate = new();
         foreach (BsonDocument profileBson in collection.FindAll())
         {
             BsonArray? folders = profileBson["Folders"]?.AsArray;
@@ -48,10 +43,8 @@ public class M0024NodeProviders : IStorageMigration
                 }
             }
 
-            profilesToUpdate.Add(profileBson);
+            collection.Update(profileBson);
         }
-
-        collection.Update(profilesToUpdate);
     }
 
     private void MigrateProfileElement(BsonDocument profileElement)

src/Artemis.Storage/Migrations/Storage/M0025NodeProvidersProfileConfig.cs

@@ -1,46 +0,0 @@
-using System.Collections.Generic;
-using LiteDB;
-
-namespace Artemis.Storage.Migrations.Storage;
-
-public class M0025NodeProvidersProfileConfig : IStorageMigration
-{
-    public int UserVersion => 25;
-
-    public void Apply(LiteRepository repository)
-    {
-        ILiteCollection<BsonDocument> categoryCollection = repository.Database.GetCollection("ProfileCategoryEntity");
-        List<BsonDocument> toUpdate = new();
-        foreach (BsonDocument profileCategoryBson in categoryCollection.FindAll())
-        {
-            BsonArray? profiles = profileCategoryBson["ProfileConfigurations"]?.AsArray;
-            if (profiles != null)
-            {
-                foreach (BsonValue profile in profiles)
-                {
-                    profile["Version"] = 2;
-                    MigrateNodeScript(profile["ActivationCondition"]?.AsDocument);
-                }
-                toUpdate.Add(profileCategoryBson);
-            }
-        }
-        
-        categoryCollection.Update(toUpdate);
-    }
-    
-    private void MigrateNodeScript(BsonDocument? nodeScript)
-    {
-        if (nodeScript == null || nodeScript.Keys.Count == 0)
-            return;
-
-        BsonArray? nodes = nodeScript["Nodes"]?.AsArray;
-        if (nodes == null)
-            return;
-
-        foreach (BsonValue node in nodes)
-        {
-            node.AsDocument["Type"] = node.AsDocument["Type"]?.AsString?.Replace("Artemis.VisualScripting.Nodes", "Artemis.Plugins.Nodes.General.Nodes");
-            node.AsDocument["ProviderId"] = "Artemis.Plugins.Nodes.General.GeneralNodesProvider-d9e1ee78";
-        }
-    }
-}