cleanup object-main-folder viewmodel interaction

Author: LeftofZen

AvaGui/Models/UiLocoFile.cs

@@ -6,7 +6,7 @@ namespace AvaGui.Models
 	[TypeConverter(typeof(ExpandableObjectConverter))]
 	public class UiLocoFile : IUiObject
 	{
-		public DatFileInfo? DatFileInfo { get; set; }
+		public required DatFileInfo DatFileInfo { get; set; }
 		public ILocoObject? LocoObject { get; set; }
 	}
 }

AvaGui/ViewModels/DatTypes/ObjectEditorViewModel.cs

@@ -1,7 +1,6 @@
 using ReactiveUI;
 using AvaGui.Models;
 using OpenLoco.ObjectEditor.DatFileParsing;
-using System;
 using ReactiveUI.Fody.Helpers;
 using System.Reactive;
 using OpenLoco.ObjectEditor.Logging;
@@ -22,60 +21,59 @@ public class ObjectEditorViewModel : ReactiveObject, ILocoFileViewModel
 		[Reactive]
 		public IExtraContentViewModel? ExtraContentViewModel { get; set; }
 
-		ObjectEditorModel Model { get; }
+		ObjectEditorModel Model { get; init; }
 
 		[Reactive]
-		public UiLocoFile? CurrentObject { private set; get; }
+		public UiLocoFile? CurrentObject { get; private set; }
 
 		[Reactive]
-		public FileSystemItemBase? CurrentFile { get; set; }
+		public FileSystemItemBase CurrentFile { get; init; }
 
-		public ObjectEditorViewModel(ObjectEditorModel model)
+		ILogger? Logger => Model.Logger;
+
+		public ObjectEditorViewModel(FileSystemItemBase currentFile, ObjectEditorModel model)
 		{
+			CurrentFile = currentFile;
 			Model = model;
-			_ = this.WhenAnyValue(o => o.CurrentFile)
-				.Subscribe(_ => SelectedObjectChanged());
 
-			ReloadObjectCommand = ReactiveCommand.Create(ReloadCurrentObject);
+			LoadObject();
+
+			ReloadObjectCommand = ReactiveCommand.Create(LoadObject);
 			SaveObjectCommand = ReactiveCommand.Create(SaveCurrentObject);
 			SaveAsObjectCommand = ReactiveCommand.Create(SaveAsCurrentObject);
 		}
 
-		public void SelectedObjectChanged()
+		public void LoadObject()
 		{
 			// this stops any currently-playing sounds
 			if (ExtraContentViewModel is SoundViewModel svm)
 			{
 				svm.Dispose();
 			}
 
-			ReloadCurrentObject();
-
-			if (CurrentObject?.LocoObject != null)
-			{
-				StringTableViewModel = new(CurrentObject.LocoObject.StringTable);
-				ExtraContentViewModel = CurrentObject.LocoObject.Object is SoundObject
-					? new SoundViewModel(CurrentObject.LocoObject)
-					: new ImageTableViewModel(CurrentObject.LocoObject, Model.PaletteMap);
-			}
-			else
-			{
-				StringTableViewModel = null;
-				ExtraContentViewModel = null;
-			}
-		}
-
-		public void ReloadCurrentObject()
-		{
 			if (CurrentFile == null)
 			{
 				return;
 			}
 
-			Logger?.Info($"Loading {CurrentObject?.DatFileInfo.S5Header.Name} from {CurrentFile.Path}");
+			Logger?.Info($"Loading {CurrentFile.Name} from {CurrentFile.Path}");
+
 			if (Model.TryLoadObject(CurrentFile.Path, out var newObj))
 			{
 				CurrentObject = newObj;
+
+				if (CurrentObject?.LocoObject != null)
+				{
+					StringTableViewModel = new(CurrentObject.LocoObject.StringTable);
+					ExtraContentViewModel = CurrentObject.LocoObject.Object is SoundObject
+						? new SoundViewModel(CurrentObject.LocoObject)
+						: new ImageTableViewModel(CurrentObject.LocoObject, Model.PaletteMap);
+				}
+				else
+				{
+					StringTableViewModel = null;
+					ExtraContentViewModel = null;
+				}
 			}
 			else
 			{
@@ -113,7 +111,5 @@ public void SaveAsCurrentObject()
 			Logger?.Info($"Saving {CurrentObject.DatFileInfo.S5Header.Name} to {saveFile.Path.AbsolutePath}");
 			SawyerStreamWriter.Save(saveFile.Path.AbsolutePath, CurrentObject.DatFileInfo.S5Header.Name, CurrentObject.LocoObject);
 		}
-
-		ILogger? Logger => Model.Logger;
 	}
 }

AvaGui/ViewModels/FolderTreeViewModel.cs

@@ -22,15 +22,12 @@ public FolderTreeViewModel(ObjectEditorModel model)
 		{
 			Model = model;
 			Progress = new();
-			Progress.ProgressChanged += (a, b) =>
-			{
-				IndexingProgress = b;
-			};
+			Progress.ProgressChanged += (_, progress) => IndexingProgress = progress;
 
 			RecreateIndex = ReactiveCommand.Create(async () => await LoadObjDirectoryAsync(CurrentDirectory, false));
 
 			_ = this.WhenAnyValue(o => o.CurrentDirectory)
-				.Subscribe(async _ => await LoadObjDirectoryAsync(CurrentDirectory, true));
+				.Subscribe(async _ => await LoadObjDirectoryAsync(CurrentDirectory, false));
 			_ = this.WhenAnyValue(o => o.DisplayVanillaOnly)
 				.Subscribe(async _ => await LoadObjDirectoryAsync(CurrentDirectory, true));
 			_ = this.WhenAnyValue(o => o.FilenameFilter)

AvaGui/ViewModels/MainWindowViewModel.cs

@@ -37,7 +37,6 @@ public class MainWindowViewModel : ViewModelBase
 
 		public FolderTreeViewModel FolderTreeViewModel { get; }
 
-		public ObjectEditorViewModel ObjectEditorViewModel { get; }
 		public SCV5ViewModel SCV5ViewModel { get; }
 
 		[Reactive]
@@ -78,16 +77,9 @@ public MainWindowViewModel()
 			};
 
 			FolderTreeViewModel = new FolderTreeViewModel(Model);
-			ObjectEditorViewModel = new ObjectEditorViewModel(Model);
-
-			_ = ObjectEditorViewModel.WhenAnyValue(o => o.CurrentFile)
-				.Subscribe(_ => CurrentEditorModel = ObjectEditorViewModel);
-
-			_ = this.WhenAnyValue(o => o.ObjectEditorViewModel)
-				.Subscribe(_ => CurrentEditorModel = ObjectEditorViewModel);
 
 			_ = FolderTreeViewModel.WhenAnyValue(o => o.CurrentlySelectedObject)
-				.Subscribe(o => ObjectEditorViewModel.CurrentFile = o);
+				.Subscribe(SetObjectViewModel);
 
 			ObjDataItems = new ObservableCollection<MenuItemModel>(Model.Settings.ObjDataDirectories
 				.Select(x => new MenuItemModel(
@@ -118,6 +110,14 @@ public MainWindowViewModel()
 			#endregion
 		}
 
+		void SetObjectViewModel(FileSystemItemBase? file)
+		{
+			if (file != null)
+			{
+				CurrentEditorModel = new ObjectEditorViewModel(file, Model);
+			}
+		}
+
 		public async Task LoadSingleObjectToIndex()
 		{
 			var openFile = await PlatformSpecific.OpenFilePicker();
@@ -136,7 +136,8 @@ public async Task LoadSingleObjectToIndex()
 			if (Model.TryLoadObject(path, out var uiLocoFile))
 			{
 				Model.Logger.Warning($"Successfully loaded {path}");
-				ObjectEditorViewModel.CurrentFile = new FileSystemItem(path, uiLocoFile!.DatFileInfo.S5Header.Name, uiLocoFile.DatFileInfo.S5Header.SourceGame);
+				var file = new FileSystemItem(path, uiLocoFile!.DatFileInfo.S5Header.Name, uiLocoFile.DatFileInfo.S5Header.SourceGame);
+				SetObjectViewModel(file);
 			}
 			else
 			{
@@ -191,8 +192,6 @@ public async Task SelectNewFolder()
 			if (Directory.Exists(dirPath) && !Model.Settings.ObjDataDirectories.Contains(dirPath))
 			{
 				FolderTreeViewModel.CurrentDirectory = dirPath; // this will cause the reindexing
-																//var progress = new Progress<float>();
-																//await Model.LoadObjDirectoryAsync(dirPath, progress, false);
 				var menuItem = new MenuItemModel(
 					dirPath,
 					ReactiveCommand.Create(() => FolderTreeViewModel.CurrentDirectory = dirPath)