Turn metadatafactory into a singleton instead of static. Speeds up testing and application start when its not needed.

donkeyProgramming · donkeyProgramming · commit f3db18b83083 · 2025-01-11T21:56:44.000+01:00
diff --git a/Editors/AnimationMeta/DependencyInjectionContainer.cs b/Editors/AnimationMeta/DependencyInjectionContainer.cs
@@ -1,7 +1,6 @@
 ﻿using AnimationEditor.Common.BaseControl;
 using Editors.AnimationMeta.MetaEditor.Commands;
 using Editors.AnimationMeta.Presentation;
-using Editors.AnimationMeta.Presentation.Commands;
 using Editors.AnimationMeta.Presentation.View;
 using Editors.AnimationMeta.SuperView;
 using Editors.AnimationMeta.Visualisation;
@@ -19,8 +18,7 @@ public class DependencyInjectionContainer : DependencyContainer
     {
         public override void Register(IServiceCollection serviceCollection)
         {
-            MetaDataTagDeSerializer.EnsureMappingTableCreated();
-
+            serviceCollection.AddSingleton<MetaDataTagDeSerializer>();
             serviceCollection.AddTransient<MainEditorView>();
             serviceCollection.AddTransient<MetaDataEditorViewModel>();
 
diff --git a/Editors/AnimationMeta/MetaEditor/Commands/CopyPastCommand.cs b/Editors/AnimationMeta/MetaEditor/Commands/CopyPastCommand.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using Editors.AnimationMeta.Presentation;
 using Shared.Core.Events;
 using Shared.Core.Misc;
 using Shared.GameFormats.AnimationMeta.Parsing;
 
-namespace Editors.AnimationMeta.Presentation.Commands
+namespace Editors.AnimationMeta.MetaEditor.Commands
 {
     public class MetaDataTagCopyItem : ICopyPastItem
     {
@@ -17,10 +18,12 @@ public class MetaDataTagCopyItem : ICopyPastItem
     class CopyPastCommand : IUiCommand
     {
         private readonly CopyPasteManager _copyPasteManager;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
 
-        public CopyPastCommand(CopyPasteManager copyPasteManager)
+        public CopyPastCommand(CopyPasteManager copyPasteManager, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _copyPasteManager = copyPasteManager;
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
         }
 
         public void ExecuteCopy(MetaDataEditorViewModel controller)
@@ -61,17 +64,17 @@ public void ExecutePaste(MetaDataEditorViewModel controller)
             {
                 var pasteObjects = pastObject.Items;
                 var confirm = MessageBox.Show($"Paste {pasteObjects.Count} metadata objects?", "Meta Copy Paste", MessageBoxButton.YesNo);
-                if (confirm != MessageBoxResult.Yes) 
+                if (confirm != MessageBoxResult.Yes)
                     return;
 
                 foreach (var item in pasteObjects)
                 {
                     try
                     {
-                        var typed = MetaDataTagDeSerializer.DeSerialize(item, out var errorStr);
+                        var typed = _metaDataTagDeSerializer.DeSerialize(item, out var errorStr);
                         if (typed == null)
                             throw new Exception(errorStr);
-                        controller.Tags.Add(new MetaDataEntry(typed));
+                        controller.Tags.Add(new MetaDataEntry(typed, _metaDataTagDeSerializer));
                     }
                     catch
                     {
@@ -84,7 +87,7 @@ public void ExecutePaste(MetaDataEditorViewModel controller)
         }
 
 
-       
+
 
     }
 }
diff --git a/Editors/AnimationMeta/MetaEditor/Commands/DeleteEntryCommand.cs b/Editors/AnimationMeta/MetaEditor/Commands/DeleteEntryCommand.cs
@@ -1,11 +1,11 @@
 ﻿using System.Linq;
+using Editors.AnimationMeta.Presentation;
 using Shared.Core.Events;
 
-namespace Editors.AnimationMeta.Presentation.Commands
+namespace Editors.AnimationMeta.MetaEditor.Commands
 {
     internal class DeleteEntryCommand : IUiCommand
     {
-
         public void Execute(MetaDataEditorViewModel controller)
         {
             if (controller.SelectedTag == null)
diff --git a/Editors/AnimationMeta/MetaEditor/Commands/MoveEntryCommand.cs b/Editors/AnimationMeta/MetaEditor/Commands/MoveEntryCommand.cs
@@ -1,6 +1,7 @@
-﻿using Shared.Core.Events;
+﻿using Editors.AnimationMeta.Presentation;
+using Shared.Core.Events;
 
-namespace Editors.AnimationMeta.Presentation.Commands
+namespace Editors.AnimationMeta.MetaEditor.Commands
 {
     internal class MoveEntryCommand : IUiCommand
     {
diff --git a/Editors/AnimationMeta/MetaEditor/Commands/NewEntryCommand.cs b/Editors/AnimationMeta/MetaEditor/Commands/NewEntryCommand.cs
@@ -3,15 +3,23 @@
 using Shared.Core.Events;
 using Shared.GameFormats.AnimationMeta.Parsing;
 using System.Windows;
+using Editors.AnimationMeta.Presentation;
 
-namespace Editors.AnimationMeta.Presentation.Commands
+namespace Editors.AnimationMeta.MetaEditor.Commands
 {
     internal class NewEntryCommand : IUiCommand
     {
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
+
+        public NewEntryCommand(MetaDataTagDeSerializer metaDataTagDeSerializer) 
+        {
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
+        }
+
         public void Execute(MetaDataEditorViewModel controller)
         {
             var dialog = new NewMetaDataEntryWindow() { Owner = Application.Current.MainWindow };
-            var allDefs = MetaDataTagDeSerializer.GetSupportedTypes();
+            var allDefs = _metaDataTagDeSerializer.GetSupportedTypes();
 
             var model = new NewTagWindowViewModel
             {
@@ -22,8 +30,8 @@ public void Execute(MetaDataEditorViewModel controller)
             var res = dialog.ShowDialog();
             if (res.HasValue && res.Value == true)
             {
-                var newEntry = MetaDataTagDeSerializer.CreateDefault(model.SelectedItem);
-                var newTagView = new MetaDataEntry(newEntry);
+                var newEntry = _metaDataTagDeSerializer.CreateDefault(model.SelectedItem);
+                var newTagView = new MetaDataEntry(newEntry, _metaDataTagDeSerializer);
                 controller.Tags.Add(newTagView);
             }
 
diff --git a/Editors/AnimationMeta/MetaEditor/MetaDataEditorViewModel.cs b/Editors/AnimationMeta/MetaEditor/MetaDataEditorViewModel.cs
@@ -3,7 +3,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Editors.AnimationMeta.MetaEditor.Commands;
-using Editors.AnimationMeta.Presentation.Commands;
 using Shared.Core.Events;
 using Shared.Core.PackFiles.Models;
 using Shared.Core.ToolCreation;
@@ -14,6 +13,7 @@ namespace Editors.AnimationMeta.Presentation
     public partial class MetaDataEditorViewModel : ObservableObject, IEditorInterface, ISaveableEditor, IFileEditor
     {
         private readonly IUiCommandFactory _uiCommandFactory;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
 
         [ObservableProperty] string _displayName = "Metadata Editor";
         [ObservableProperty] IMetaDataEntry _selectedTag;
@@ -23,9 +23,10 @@ public partial class MetaDataEditorViewModel : ObservableObject, IEditorInterfac
         public bool HasUnsavedChanges { get; set; } = false;
         public PackFile CurrentFile { get; set; }
 
-        public MetaDataEditorViewModel(IUiCommandFactory uiCommandFactory)
+        public MetaDataEditorViewModel(IUiCommandFactory uiCommandFactory, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _uiCommandFactory = uiCommandFactory;
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
         }
 
         public bool Save() => _uiCommandFactory.Create<SaveCommand>().Execute(this);
@@ -46,15 +47,15 @@ public void LoadFile(PackFile file)
             var fileContent = CurrentFile.DataSource.ReadData();
 
             var parser = new MetaDataFileParser();
-            var loadedMetadataFile = parser.ParseFile(fileContent);
+            var loadedMetadataFile = parser.ParseFile(fileContent, _metaDataTagDeSerializer);
             MetaDataFileVersion = loadedMetadataFile.Version;
 
             foreach (var item in loadedMetadataFile.Items)
             {
                 if (item is UnknownMetaEntry uknMeta)
                     Tags.Add(new UnkMetaDataEntry(uknMeta));
                 else if (item is BaseMetaEntry metaBase)
-                    Tags.Add(new MetaDataEntry(metaBase));
+                    Tags.Add(new MetaDataEntry(metaBase, _metaDataTagDeSerializer));
                 else
                     throw new Exception($"{item.GetType()} is not a known type for {nameof(MetaDataEditorViewModel)}");
             }
diff --git a/Editors/AnimationMeta/MetaEditor/MetaDataEntry.cs b/Editors/AnimationMeta/MetaEditor/MetaDataEntry.cs
@@ -57,11 +57,11 @@ public class MetaDataEntry : IMetaDataEntry
         private readonly ILogger _logger = Logging.Create<MetaDataEntry>();
         private readonly string _originalName;
 
-        public MetaDataEntry(BaseMetaEntry typedMetaItem)
+        public MetaDataEntry(BaseMetaEntry typedMetaItem, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _originalName = typedMetaItem.Name;
             DisplayName = typedMetaItem.DisplayName;
-            Description = MetaDataTagDeSerializer.GetDescriptionSafe(_originalName);
+            Description = metaDataTagDeSerializer.GetDescriptionSafe(_originalName);
             Version = typedMetaItem.Version;
 
             var orderedPropertiesList = typedMetaItem.GetType().GetProperties()
diff --git a/Editors/AnimationMeta/SuperView/SuperViewViewModel.cs b/Editors/AnimationMeta/SuperView/SuperViewViewModel.cs
@@ -9,6 +9,7 @@
 using Shared.Core.Events;
 using Shared.Core.Events.Scoped;
 using Shared.Core.PackFiles;
+using Shared.GameFormats.AnimationMeta.Parsing;
 
 namespace Editors.AnimationMeta.SuperView
 {
@@ -17,6 +18,7 @@ public partial class SuperViewViewModel : EditorHostBase
         SceneObjectViewModel _asset;
 
         private readonly SceneObjectEditor _sceneObjectBuilder;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
         private readonly IPackFileService _packFileService;
         private readonly IEventHub _eventHub;
         private readonly IUiCommandFactory _uiCommandFactory;
@@ -33,15 +35,16 @@ public SuperViewViewModel(
             IEventHub eventHub,
             IUiCommandFactory uiCommandFactory,
             SceneObjectEditor sceneObjectBuilder,
-            IEditorHostParameters editorHostParameters)
+            IEditorHostParameters editorHostParameters,
+            MetaDataTagDeSerializer metaDataTagDeSerializer)
             : base(editorHostParameters)
         {
             DisplayName = "Super view";
             _packFileService = packFileService;
             _eventHub = eventHub;
             _uiCommandFactory = uiCommandFactory;
             _sceneObjectBuilder = sceneObjectBuilder;
-
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
             Initialize();
             eventHub.Register<ScopedFileSavedEvent>(this, OnFileSaved);
             eventHub.Register<SceneObjectUpdateEvent>(this, OnSceneObjectUpdated);
@@ -60,8 +63,8 @@ private void OnFileSaved(ScopedFileSavedEvent evnt)
 
         void Initialize()
         {
-            PersistentMetaEditor = new MetaDataEditorViewModel(_uiCommandFactory);
-            MetaEditor = new MetaDataEditorViewModel(_uiCommandFactory);
+            PersistentMetaEditor = new MetaDataEditorViewModel(_uiCommandFactory, _metaDataTagDeSerializer);
+            MetaEditor = new MetaDataEditorViewModel(_uiCommandFactory, _metaDataTagDeSerializer);
             
             var assetViewModel = _sceneObjectViewModelBuilder.CreateAsset("SuperViewRoot", true, "Root", Color.Black,null, true);
             SceneObjects.Add(assetViewModel);
diff --git a/Editors/Reports/Animation/AnimMetaDataJsonGenerator.cs b/Editors/Reports/Animation/AnimMetaDataJsonGenerator.cs
@@ -25,18 +25,20 @@ public class AnimMetaDataJsonGenerator
         private readonly ILogger _logger = Logging.Create<AnimMetaDataJsonGenerator>();
         private readonly IPackFileService _pfs;
         private readonly ApplicationSettingsService _settingsService;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
         private readonly JsonSerializerSettings _jsonOptions;
 
-        public AnimMetaDataJsonGenerator(IPackFileService pfs, ApplicationSettingsService settingsService)
+        public AnimMetaDataJsonGenerator(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _pfs = pfs;
             _settingsService = settingsService;
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
             _jsonOptions = new JsonSerializerSettings { Formatting = Formatting.Indented };
         }
 
-        public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService)
+        public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
-            var instance = new AnimMetaDataJsonGenerator(pfs, settingsService);
+            var instance = new AnimMetaDataJsonGenerator(pfs, settingsService, metaDataTagDeSerializer);
             instance.Create();
         }
 
@@ -62,7 +64,7 @@ public void Create()
             var animPack = packFileContainer[0].FileList["animations\\database\\battle\\bin\\animation_tables.animpack"];
             var animPackFile = AnimationPackSerializer.Load(animPack, _pfs);
 
-            var converter = new AnimationBinWh3FileToXmlConverter(null);
+            var converter = new AnimationBinWh3FileToXmlConverter(null, _metaDataTagDeSerializer);
             foreach (var animFile in animPackFile.Files)
             {
                 if (animFile is AnimationBinWh3)
@@ -84,7 +86,7 @@ public void Create()
                         continue;
 
                     var parser = new MetaDataFileParser();
-                    var metaData = parser.ParseFile(data);
+                    var metaData = parser.ParseFile(data, _metaDataTagDeSerializer);
                     DumpAsJson(gameOutputDir, fileName + ".json", metaData);
                 }
                 catch (Exception e)
diff --git a/Editors/Reports/Animation/AnimMetaDataReportGenerator.cs b/Editors/Reports/Animation/AnimMetaDataReportGenerator.cs
@@ -31,16 +31,18 @@ class FileReport
 
         private readonly IPackFileService _pfs;
         private readonly ApplicationSettingsService _settingsService;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
 
-        public AnimMetaDataReportGenerator(IPackFileService pfs, ApplicationSettingsService settingsService)
+        public AnimMetaDataReportGenerator(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _pfs = pfs;
             _settingsService = settingsService;
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
         }
 
-        public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService)
+        public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
-            var instance = new AnimMetaDataReportGenerator(pfs, settingsService);
+            var instance = new AnimMetaDataReportGenerator(pfs, settingsService, metaDataTagDeSerializer);
             instance.Create();
         }
 
@@ -75,7 +77,7 @@ public void Create()
                         continue;
 
                     var parser = new MetaDataFileParser();
-                    var metaData = parser.ParseFile(data);
+                    var metaData = parser.ParseFile(data, _metaDataTagDeSerializer);
                     metaTable.Add((fileName, metaData));
 
                     var completedTags = 0;
@@ -89,7 +91,7 @@ public void Create()
 
                         try
                         {
-                            var variables = MetaDataTagDeSerializer.DeSerializeToStrings(item, out var errorMessage);
+                            var variables = _metaDataTagDeSerializer.DeSerializeToStrings(item, out var errorMessage);
                             if (variables != null)
                             {
 
diff --git a/Editors/Shared/Editors.Shared.Core/Common/ReferenceModel/SceneObjectViewModel.cs b/Editors/Shared/Editors.Shared.Core/Common/ReferenceModel/SceneObjectViewModel.cs
@@ -12,6 +12,7 @@ public partial class SceneObjectViewModel : ObservableObject
         private readonly IPackFileService _pfs;
         private readonly IStandardDialogs _uiProvider;
         private readonly SceneObjectEditor _sceneObjectBuilder;
+        private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
         private readonly IMetaDataFactory _metaDataFactory;
 
         [ObservableProperty] string _headerName;
@@ -34,13 +35,14 @@ public SceneObjectViewModel(
             SceneObject data,
             string headerName,
             SceneObjectEditor sceneObjectBuilder,
-            SkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper)
+            SkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper,
+            MetaDataTagDeSerializer metaDataTagDeSerializer)
         {
             _metaDataFactory = metaDataFactory;
             _pfs = packFileService;
             _uiProvider = uiProvider;
             _sceneObjectBuilder = sceneObjectBuilder;
-           
+            _metaDataTagDeSerializer = metaDataTagDeSerializer;
             Data = data;
             HeaderName = headerName;
 
@@ -93,8 +95,8 @@ void RecreateMetaDataInformation(SceneObject model)
             model.Player.AnimationRules.Clear();
 
             var parser = new MetaDataFileParser();
-            var persist = parser.ParseFile(model.PersistMetaData);
-            var meta = parser.ParseFile(model.MetaData);
+            var persist = parser.ParseFile(model.PersistMetaData, _metaDataTagDeSerializer);
+            var meta = parser.ParseFile(model.MetaData, _metaDataTagDeSerializer);
             model.MetaDataItems = _metaDataFactory.Create(persist, meta, model.MainNode, model, model.Player, FragAndSlotSelection.FragmentList.SelectedItem);
         }
     }
diff --git a/Editors/Shared/Editors.Shared.Core/Common/SceneObjectViewModelBuilder.cs b/Editors/Shared/Editors.Shared.Core/Common/SceneObjectViewModelBuilder.cs
diff --git a/Editors/SimpleAnimationEditors/AnimationPack/AnimPackViewModel.cs b/Editors/SimpleAnimationEditors/AnimationPack/AnimPackViewModel.cs
diff --git a/Editors/SimpleAnimationEditors/AnimationPack/Converters/AnimationBinWh3FileToXmlConverter.cs b/Editors/SimpleAnimationEditors/AnimationPack/Converters/AnimationBinWh3FileToXmlConverter.cs
diff --git a/Shared/GameFiles/AnimationMeta/Parsing/MetaDataFileParser.cs b/Shared/GameFiles/AnimationMeta/Parsing/MetaDataFileParser.cs
diff --git a/Shared/GameFiles/AnimationMeta/Parsing/MetaDataTagDeSerializer.cs b/Shared/GameFiles/AnimationMeta/Parsing/MetaDataTagDeSerializer.cs

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,12 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Windows;`
	`5`	`+using Editors.AnimationMeta.Presentation;`
`5`	`6`	`using Shared.Core.Events;`
`6`	`7`	`using Shared.Core.Misc;`
`7`	`8`	`using Shared.GameFormats.AnimationMeta.Parsing;`
`8`	`9`
`9`		`-namespace Editors.AnimationMeta.Presentation.Commands`
	`10`	`+namespace Editors.AnimationMeta.MetaEditor.Commands`
`10`	`11`	`{`
`11`	`12`	`public class MetaDataTagCopyItem : ICopyPastItem`
`12`	`13`	`{`
`@@ -17,10 +18,12 @@ public class MetaDataTagCopyItem : ICopyPastItem`
`17`	`18`	`class CopyPastCommand : IUiCommand`
`18`	`19`	`{`
`19`	`20`	`private readonly CopyPasteManager _copyPasteManager;`
	`21`	`+ private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;`
`20`	`22`
`21`		`- public CopyPastCommand(CopyPasteManager copyPasteManager)`
	`23`	`+ public CopyPastCommand(CopyPasteManager copyPasteManager, MetaDataTagDeSerializer metaDataTagDeSerializer)`
`22`	`24`	`{`
`23`	`25`	`_copyPasteManager = copyPasteManager;`
	`26`	`+ _metaDataTagDeSerializer = metaDataTagDeSerializer;`
`24`	`27`	`}`
`25`	`28`
`26`	`29`	`public void ExecuteCopy(MetaDataEditorViewModel controller)`
`@@ -61,17 +64,17 @@ public void ExecutePaste(MetaDataEditorViewModel controller)`
`61`	`64`	`{`
`62`	`65`	`var pasteObjects = pastObject.Items;`
`63`	`66`	`var confirm = MessageBox.Show($"Paste {pasteObjects.Count} metadata objects?", "Meta Copy Paste", MessageBoxButton.YesNo);`
`64`		`- if (confirm != MessageBoxResult.Yes)`
	`67`	`+ if (confirm != MessageBoxResult.Yes)`
`65`	`68`	`return;`
`66`	`69`
`67`	`70`	`foreach (var item in pasteObjects)`
`68`	`71`	`{`
`69`	`72`	`try`
`70`	`73`	`{`
`71`		`- var typed = MetaDataTagDeSerializer.DeSerialize(item, out var errorStr);`
	`74`	`+ var typed = _metaDataTagDeSerializer.DeSerialize(item, out var errorStr);`
`72`	`75`	`if (typed == null)`
`73`	`76`	`throw new Exception(errorStr);`
`74`		`- controller.Tags.Add(new MetaDataEntry(typed));`
	`77`	`+ controller.Tags.Add(new MetaDataEntry(typed, _metaDataTagDeSerializer));`
`75`	`78`	`}`
`76`	`79`	`catch`
`77`	`80`	`{`
`@@ -84,7 +87,7 @@ public void ExecutePaste(MetaDataEditorViewModel controller)`
`84`	`87`	`}`
`85`	`88`
`86`	`89`
`87`		`-`
	`90`	`+`
`88`	`91`
`89`	`92`	`}`
`90`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using System.Linq;`
	`2`	`+using Editors.AnimationMeta.Presentation;`
`2`	`3`	`using Shared.Core.Events;`
`3`	`4`
`4`		`-namespace Editors.AnimationMeta.Presentation.Commands`
	`5`	`+namespace Editors.AnimationMeta.MetaEditor.Commands`
`5`	`6`	`{`
`6`	`7`	`internal class DeleteEntryCommand : IUiCommand`
`7`	`8`	`{`
`8`		`-`
`9`	`9`	`public void Execute(MetaDataEditorViewModel controller)`
`10`	`10`	`{`
`11`	`11`	`if (controller.SelectedTag == null)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-using Shared.Core.Events;`
	`1`	`+using Editors.AnimationMeta.Presentation;`
	`2`	`+using Shared.Core.Events;`
`2`	`3`
`3`		`-namespace Editors.AnimationMeta.Presentation.Commands`
	`4`	`+namespace Editors.AnimationMeta.MetaEditor.Commands`
`4`	`5`	`{`
`5`	`6`	`internal class MoveEntryCommand : IUiCommand`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,23 @@`
`3`	`3`	`using Shared.Core.Events;`
`4`	`4`	`using Shared.GameFormats.AnimationMeta.Parsing;`
`5`	`5`	`using System.Windows;`
	`6`	`+using Editors.AnimationMeta.Presentation;`
`6`	`7`
`7`		`-namespace Editors.AnimationMeta.Presentation.Commands`
	`8`	`+namespace Editors.AnimationMeta.MetaEditor.Commands`
`8`	`9`	`{`
`9`	`10`	`internal class NewEntryCommand : IUiCommand`
`10`	`11`	`{`
	`12`	`+ private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;`
	`13`	`+`
	`14`	`+ public NewEntryCommand(MetaDataTagDeSerializer metaDataTagDeSerializer)`
	`15`	`+ {`
	`16`	`+ _metaDataTagDeSerializer = metaDataTagDeSerializer;`
	`17`	`+ }`
	`18`	`+`
`11`	`19`	`public void Execute(MetaDataEditorViewModel controller)`
`12`	`20`	`{`
`13`	`21`	`var dialog = new NewMetaDataEntryWindow() { Owner = Application.Current.MainWindow };`
`14`		`- var allDefs = MetaDataTagDeSerializer.GetSupportedTypes();`
	`22`	`+ var allDefs = _metaDataTagDeSerializer.GetSupportedTypes();`
`15`	`23`
`16`	`24`	`var model = new NewTagWindowViewModel`
`17`	`25`	`{`
`@@ -22,8 +30,8 @@ public void Execute(MetaDataEditorViewModel controller)`
`22`	`30`	`var res = dialog.ShowDialog();`
`23`	`31`	`if (res.HasValue && res.Value == true)`
`24`	`32`	`{`
`25`		`- var newEntry = MetaDataTagDeSerializer.CreateDefault(model.SelectedItem);`
`26`		`- var newTagView = new MetaDataEntry(newEntry);`
	`33`	`+ var newEntry = _metaDataTagDeSerializer.CreateDefault(model.SelectedItem);`
	`34`	`+ var newTagView = new MetaDataEntry(newEntry, _metaDataTagDeSerializer);`
`27`	`35`	`controller.Tags.Add(newTagView);`
`28`	`36`	`}`
`29`	`37`
Original file line number	Diff line number	Diff line change
`@@ -31,16 +31,18 @@ class FileReport`
`31`	`31`
`32`	`32`	`private readonly IPackFileService _pfs;`
`33`	`33`	`private readonly ApplicationSettingsService _settingsService;`
	`34`	`+ private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;`
`34`	`35`
`35`		`- public AnimMetaDataReportGenerator(IPackFileService pfs, ApplicationSettingsService settingsService)`
	`36`	`+ public AnimMetaDataReportGenerator(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)`
`36`	`37`	`{`
`37`	`38`	`_pfs = pfs;`
`38`	`39`	`_settingsService = settingsService;`
	`40`	`+ _metaDataTagDeSerializer = metaDataTagDeSerializer;`
`39`	`41`	`}`
`40`	`42`
`41`		`- public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService)`
	`43`	`+ public static void Generate(IPackFileService pfs, ApplicationSettingsService settingsService, MetaDataTagDeSerializer metaDataTagDeSerializer)`
`42`	`44`	`{`
`43`		`- var instance = new AnimMetaDataReportGenerator(pfs, settingsService);`
	`45`	`+ var instance = new AnimMetaDataReportGenerator(pfs, settingsService, metaDataTagDeSerializer);`
`44`	`46`	`instance.Create();`
`45`	`47`	`}`
`46`	`48`
`@@ -75,7 +77,7 @@ public void Create()`
`75`	`77`	`continue;`
`76`	`78`
`77`	`79`	`var parser = new MetaDataFileParser();`
`78`		`- var metaData = parser.ParseFile(data);`
	`80`	`+ var metaData = parser.ParseFile(data, _metaDataTagDeSerializer);`
`79`	`81`	`metaTable.Add((fileName, metaData));`
`80`	`82`
`81`	`83`	`var completedTags = 0;`
`@@ -89,7 +91,7 @@ public void Create()`
`89`	`91`
`90`	`92`	`try`
`91`	`93`	`{`
`92`		`- var variables = MetaDataTagDeSerializer.DeSerializeToStrings(item, out var errorMessage);`
	`94`	`+ var variables = _metaDataTagDeSerializer.DeSerializeToStrings(item, out var errorMessage);`
`93`	`95`	`if (variables != null)`
`94`	`96`	`{`
`95`	`97`