add saveas and open single object

Author: LeftofZen

AvaGui/ViewModels/MainWindowViewModel.cs

@@ -52,8 +52,8 @@ public class MainWindowViewModel : ViewModelBase
 
 		public ReactiveCommand<Unit, Unit> LoadPalette { get; }
 
-
 		public ReactiveCommand<Unit, Unit> OpenSettingsFolder { get; }
+		public ReactiveCommand<Unit, Task> OpenSingleObject { get; }
 
 		public const string GithubApplicationName = "ObjectEditor";
 		public const string GithubIssuePage = "https://github.com/OpenLoco/ObjectEditor/issues";
@@ -120,6 +120,7 @@ public MainWindowViewModel()
 
 			//LoadPalette = ReactiveCommand.Create(LoadPaletteFunc);
 			OpenSettingsFolder = ReactiveCommand.Create(PlatformSpecific.FolderOpenInDesktop);
+			OpenSingleObject = ReactiveCommand.Create(LoadSingleObjectToIndex);
 
 			#region Version
 
@@ -142,6 +143,33 @@ public MainWindowViewModel()
 			#endregion
 		}
 
+		public async Task LoadSingleObjectToIndex()
+		{
+			var openFile = await PlatformSpecific.OpenFilePicker();
+			if (openFile == null)
+			{
+				return;
+			}
+
+			var path = openFile.SingleOrDefault()?.Path.AbsolutePath;
+			if (path == null)
+			{
+				return;
+			}
+
+			//logger?.Info($"Opening {path}");
+			if (Model.TryGetObject(path, out UiLocoFile? uiLocoFile, true))
+			{
+				Model.Logger.Warning($"Successfully loaded {path}");
+				ObjectEditorViewModel.CurrentlySelectedObject = new FileSystemItem(path, uiLocoFile.DatFileInfo.S5Header.Name, uiLocoFile.DatFileInfo.S5Header.SourceGame);
+				ObjectEditorViewModel.CurrentObject = uiLocoFile;
+			}
+			else
+			{
+				Model.Logger.Warning($"Unable to load {path}");
+			}
+		}
+
 		static Version GetCurrentAppVersion(Assembly assembly)
 		{
 			// grab current appl version from assembly

AvaGui/ViewModels/ObjectEditorViewModel.cs

@@ -8,13 +8,16 @@
 using OpenLoco.ObjectEditor.Headers;
 using System.Reactive;
 using OpenLoco.ObjectEditor.Logging;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace AvaGui.ViewModels
 {
 	public class ObjectEditorViewModel : ReactiveObject
 	{
 		public ReactiveCommand<Unit, Unit> ReloadObjectCommand { get; init; }
 		public ReactiveCommand<Unit, Unit> SaveObjectCommand { get; init; }
+		public ReactiveCommand<Unit, Task> SaveAsObjectCommand { get; init; }
 
 		[Reactive]
 		public StringTableViewModel? StringTableViewModel { get; set; }
@@ -33,7 +36,7 @@ public UiLocoFile? CurrentObject
 			set
 			{
 				Model.ObjectCache[CurrentlySelectedObject.Path] = value;
-				this.RaiseAndSetIfChanged(ref _currentObject, value);
+				_ = this.RaiseAndSetIfChanged(ref _currentObject, value);
 			}
 		}
 
@@ -132,8 +135,8 @@ public void SaveCurrentObject()
 				return;
 			}
 
-			Logger?.Info($"[DISABLED] Saving {CurrentObject.DatFileInfo.S5Header.Name} to {CurrentlySelectedObject.Path}");
-			//SawyerStreamWriter.Save(CurrentlySelectedObject.Path, CurrentObject.DatFileInfo.S5Header.Name, CurrentObject.LocoObject);
+			Logger?.Info($"Saving {CurrentObject.DatFileInfo.S5Header.Name} to {CurrentlySelectedObject.Path}");
+			SawyerStreamWriter.Save(CurrentlySelectedObject.Path, CurrentObject.DatFileInfo.S5Header.Name, CurrentObject.LocoObject);
 		}
 
 		public void ReloadCurrentObject()
@@ -145,6 +148,24 @@ public void ReloadCurrentObject()
 			}
 		}
 
+		public async Task SaveAsCurrentObject()
+		{
+			var saveFile = await PlatformSpecific.SaveFilePicker();
+			if (saveFile == null)
+			{
+				return;
+			}
+
+			if (CurrentObject?.LocoObject == null)
+			{
+				Logger?.Error("Cannot save an object with a null loco object - the file would be empty!");
+				return;
+			}
+
+			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;
 
 		public ObjectEditorViewModel(ObjectEditorModel model)
@@ -163,6 +184,7 @@ public ObjectEditorViewModel(ObjectEditorModel model)
 
 			ReloadObjectCommand = ReactiveCommand.Create(ReloadCurrentObject);
 			SaveObjectCommand = ReactiveCommand.Create(SaveCurrentObject);
+			SaveAsObjectCommand = ReactiveCommand.Create(SaveAsCurrentObject);
 
 			//_ = this.WhenAnyValue(o => o.CurrentObject)
 			//	.Subscribe(_ => this.RaisePropertyChanged(nameof(StringTableViewModel))); // done in SelectedObjectChanged()

AvaGui/ViewModels/PlatformSpecific.cs

@@ -63,12 +63,45 @@ public static async Task<IReadOnlyList<IStorageFolder>> OpenFolderPicker()
 				throw new ArgumentNullException("ApplicationLifetime|StorageProvider", "Missing StorageProvider instance.");
 			}
 
-			var folders = await provider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
+			return await provider.OpenFolderPickerAsync(new FolderPickerOpenOptions()
 			{
 				Title = "Select a folder containing objects",
 				AllowMultiple = false
 			});
-			return folders;
+		}
+
+		public static async Task<IReadOnlyList<IStorageFile>> OpenFilePicker()
+		{
+			// See IoCFileOps project for an example of how to accomplish this.
+			if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop
+				|| desktop.MainWindow?.StorageProvider is not { } provider)
+			{
+				throw new ArgumentNullException("ApplicationLifetime|StorageProvider", "Missing StorageProvider instance.");
+			}
+
+			return await provider.OpenFilePickerAsync(new FilePickerOpenOptions()
+			{
+				Title = "Select a Locomotion object file",
+				AllowMultiple = false,
+				FileTypeFilter = [new("Locomotion DAT Files") { Patterns = ["*.dat", "*.DAT"] }]
+			});
+		}
+
+		public static async Task<IStorageFile?> SaveFilePicker()
+		{
+			// See IoCFileOps project for an example of how to accomplish this.
+			if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop
+				|| desktop.MainWindow?.StorageProvider is not { } provider)
+			{
+				throw new ArgumentNullException("ApplicationLifetime|StorageProvider", "Missing StorageProvider instance.");
+			}
+
+			return await provider.SaveFilePickerAsync(new FilePickerSaveOptions()
+			{
+				ShowOverwritePrompt = true,
+				DefaultExtension = "dat",
+				Title = "Select a new file name",
+			});
 		}
 	}
 }

AvaGui/Views/MainWindow.axaml

@@ -62,6 +62,7 @@
 				<StackPanel Orientation="Horizontal">
 					<Button Content="⭮ Reload" Command="{Binding ReloadObjectCommand}"/>
 					<Button Content="💾 Save" Command="{Binding SaveObjectCommand}"/>
+					<Button Content="💾 Save As" Command="{Binding SaveAsObjectCommand}"/>
 				</StackPanel>
 				<TabControl>
 					<TabItem Header="Headers">
@@ -141,6 +142,7 @@
 				<MenuItem Header="_File">
 					<!--<MenuItem Header="Load Palette" Command="{Binding LoadPalette}" />-->
 					<MenuItem Header="⚙ Open settings folder" Command="{Binding OpenSettingsFolder}" />
+					<MenuItem Header="🚉 Open single object" Command="{Binding OpenSingleObject}" />
 				</MenuItem>
 				<MenuItem Header="_ObjData" ItemsSource="{Binding ObjDataItems}" Classes="SubItems" >
 					<MenuItem.Styles>