Enable metadata editing and server sync for online objects

Definitions/ObjectModels/LocoObjectMetadata.cs → Definitions/ObjectModels/ObjectMetadata.cs

@@ -4,7 +4,7 @@
 
 namespace Definitions.ObjectModels;
 
-public class LocoObjectMetadata(string internalName)
+public class ObjectMetadata(string internalName)
 {
 	public UniqueObjectId UniqueObjectId { get; init; }
 

Definitions/Web/Client.cs

@@ -24,6 +24,15 @@ public static async Task<IEnumerable<DtoObjectEntry>> GetObjectListAsync(HttpCli
 			id,
 			logger);
 
+	public static async Task<DtoObjectDescriptor?> UpdateObjectAsync(HttpClient client, UniqueObjectId id, DtoObjectDescriptor request, ILogger? logger = null)
+		=> await ClientHelpers.PutAsync<DtoObjectDescriptor, DtoObjectDescriptor>(
+			client,
+			ApiVersion,
+			RoutesV2.Objects,
+			id,
+			request,
+			logger);
+
 	public static async Task<byte[]?> GetObjectFileAsync(HttpClient client, UniqueObjectId id, ILogger? logger = null)
 		=> await ClientHelpers.SendRequestAsync(
 			client,
@@ -54,4 +63,36 @@ public static async Task<IEnumerable<DtoObjectEntry>> GetObjectListAsync(HttpCli
 			entry,
 			logger);
 	}
+
+	public static async Task<IEnumerable<DtoLicenceEntry>> GetLicencesAsync(HttpClient client, ILogger? logger = null)
+		=> await ClientHelpers.GetAsync<IEnumerable<DtoLicenceEntry>>(
+			client,
+			ApiVersion,
+			RoutesV2.Licences,
+			null,
+			logger) ?? [];
+
+	public static async Task<IEnumerable<DtoAuthorEntry>> GetAuthorsAsync(HttpClient client, ILogger? logger = null)
+		=> await ClientHelpers.GetAsync<IEnumerable<DtoAuthorEntry>>(
+			client,
+			ApiVersion,
+			RoutesV2.Authors,
+			null,
+			logger) ?? [];
+
+	public static async Task<IEnumerable<DtoTagEntry>> GetTagsAsync(HttpClient client, ILogger? logger = null)
+		=> await ClientHelpers.GetAsync<IEnumerable<DtoTagEntry>>(
+			client,
+			ApiVersion,
+			RoutesV2.Tags,
+			null,
+			logger) ?? [];
+
+	public static async Task<IEnumerable<DtoItemPackEntry>> GetObjectPacksAsync(HttpClient client, ILogger? logger = null)
+		=> await ClientHelpers.GetAsync<IEnumerable<DtoItemPackEntry>>(
+			client,
+			ApiVersion,
+			RoutesV2.ObjectPacks,
+			null,
+			logger) ?? [];
 }

Gui/App.axaml

@@ -112,7 +112,7 @@
 		<DataTemplate DataType="vm:Graphics.ImageTableViewModel">
 			<vi:ImageTableView />
 		</DataTemplate>
-		<DataTemplate DataType="vm:LocoObjectMetadataViewModel">
+		<DataTemplate DataType="vm:ObjectMetadataViewModel">
 			<vi:MetadataView />
 		</DataTemplate>
 		<DataTemplate DataType="vm:ObjectEditorViewModel">

Gui/Converters/EnumToMaterialIconConverter.cs

@@ -58,7 +58,7 @@ public class EnumToMaterialIconConverter : IValueConverter
 	static readonly Dictionary<string, string> MiscMappings = new()
 	{
 		{ nameof(ObjectIndexEntry), "ViewList" },
-		{ nameof(LocoObjectMetadata), "ViewListOutline" },
+		{ nameof(ObjectMetadata), "ViewListOutline" },
 	};
 
 	static readonly Dictionary<ObjectType, string> ObjectMapping = new()

Gui/Models/LocoUIObjectModel.cs

@@ -8,6 +8,6 @@ namespace Gui.Models;
 public class LocoUIObjectModel
 {
 	public LocoObject? LocoObject { get; set; }
-	public LocoObjectMetadata? Metadata { get; set; }
+	public ObjectMetadata? Metadata { get; set; }
 	public DatHeaderInfo? DatInfo { get; set; }
 }

Gui/Models/ObjectEditorModel.cs

@@ -197,7 +197,7 @@ bool TryLoadOnlineFile(FileSystemItem filesystemItem, out LocoUIObjectModel? loc
 
 		DatHeaderInfo? fileInfo = null;
 		LocoObject? locoObject = null;
-		LocoObjectMetadata? metadata = null;
+		ObjectMetadata? metadata = null;
 		//List<Image<Rgba32>> images = [];
 
 		if (filesystemItem.Id == null)
@@ -304,7 +304,7 @@ bool TryLoadOnlineFile(FileSystemItem filesystemItem, out LocoUIObjectModel? loc
 				fileInfo = new DatHeaderInfo(fakeS5Header, ObjectHeader.NullHeader);
 			}
 
-			metadata = new LocoObjectMetadata(cachedLocoObjDto.Name)
+			metadata = new ObjectMetadata(cachedLocoObjDto.Name)
 			{
 				UniqueObjectId = cachedLocoObjDto.Id,
 				Description = cachedLocoObjDto.Description,
@@ -342,7 +342,7 @@ bool TryLoadLocalFile(FileSystemItem filesystemItem, out LocoUIObjectModel? loco
 
 		DatHeaderInfo? fileInfo = null;
 		LocoObject? locoObject = null;
-		LocoObjectMetadata? metadata = null;
+		ObjectMetadata? metadata = null;
 
 		var filename = File.Exists(filesystemItem.FileName)
 			? filesystemItem.FileName
@@ -351,7 +351,7 @@ bool TryLoadLocalFile(FileSystemItem filesystemItem, out LocoUIObjectModel? loco
 		var obj = SawyerStreamReader.LoadFullObject(filename, logger: Logger);
 		fileInfo = obj.DatFileInfo;
 		locoObject = obj.LocoObject;
-		metadata = new LocoObjectMetadata("<unknown>")
+		metadata = new ObjectMetadata("<unknown>")
 		{
 			CreatedDate = filesystemItem.CreatedDate?.ToDateTimeOffset(),
 			ModifiedDate = filesystemItem.ModifiedDate?.ToDateTimeOffset(),

Gui/ObjectServiceClient.cs

@@ -64,6 +64,9 @@ public async Task<IEnumerable<DtoObjectEntry>> GetObjectListAsync()
 	public async Task<DtoObjectDescriptor?> GetObjectAsync(UniqueObjectId id)
 		=> await Client.GetObjectAsync(WebClient, id, Logger);
 
+	public async Task<DtoObjectDescriptor?> UpdateObjectAsync(UniqueObjectId id, DtoObjectDescriptor request)
+		=> await Client.UpdateObjectAsync(WebClient, id, request, Logger);
+
 	public async Task<byte[]?> GetObjectFileAsync(UniqueObjectId id)
 		=> await Client.GetObjectFileAsync(WebClient, id, Logger);
 
@@ -72,4 +75,16 @@ public async Task<IEnumerable<DtoObjectEntry>> GetObjectListAsync()
 
 	public async Task<DtoObjectMissingEntry?> AddMissingObjectAsync(DtoObjectMissingUpload entry)
 		=> await Client.AddMissingObjectAsync(WebClient, entry, Logger);
+
+	public async Task<IEnumerable<DtoLicenceEntry>> GetLicencesAsync()
+		=> await Client.GetLicencesAsync(WebClient, Logger);
+
+	public async Task<IEnumerable<DtoAuthorEntry>> GetAuthorsAsync()
+		=> await Client.GetAuthorsAsync(WebClient, Logger);
+
+	public async Task<IEnumerable<DtoTagEntry>> GetTagsAsync()
+		=> await Client.GetTagsAsync(WebClient, Logger);
+
+	public async Task<IEnumerable<DtoItemPackEntry>> GetObjectPacksAsync()
+		=> await Client.GetObjectPacksAsync(WebClient, Logger);
 }

Gui/ViewModels/FolderTreeViewModel.cs

@@ -47,7 +47,7 @@ public DesignerFolderTreeViewModel()
 		var availableFilterCategories = new List<FilterTypeViewModel>
 		{
 			new() { Type = typeof(ObjectIndexEntry), DisplayName = "Index data", IconName = nameof(ObjectIndexEntry) },
-			new() { Type = typeof (LocoObjectMetadata), DisplayName = "Metadata", IconName = nameof(LocoObjectMetadata) }
+			new() { Type = typeof (ObjectMetadata), DisplayName = "Metadata", IconName = nameof(ObjectMetadata) }
 		};
 
 		//Filters.Add(new FilterViewModel(availableFilterCategories, RemoveFilter));

Gui/ViewModels/LocoTypes/ObjectEditorViewModel.cs

@@ -5,6 +5,7 @@
 using Dat.Converters;
 using Dat.Data;
 using Dat.FileParsing;
+using Definitions.DTO;
 using Definitions.ObjectModels;
 using Definitions.ObjectModels.Objects.Common;
 using Definitions.ObjectModels.Objects.Sound;
@@ -50,7 +51,7 @@ public class ObjectEditorViewModel : BaseFileViewModel
 	public LocoUIObjectModel? CurrentObject { get; private set; }
 
 	[Reactive]
-	public LocoObjectMetadataViewModel? MetadataViewModel { get; set; }
+	public ObjectMetadataViewModel? MetadataViewModel { get; set; }
 
 	[Reactive]
 	public ObjectModelHeaderViewModel? ObjectModelHeaderViewModel { get; set; }
@@ -308,7 +309,7 @@ public override void Load()
 
 			if (CurrentObject?.Metadata != null)
 			{
-				MetadataViewModel = new LocoObjectMetadataViewModel(CurrentObject.Metadata);
+				MetadataViewModel = new ObjectMetadataViewModel(CurrentObject.Metadata, Model.ObjectServiceClient);
 			}
 			else
 			{
@@ -350,6 +351,75 @@ public override void Save()
 			? CurrentFile.FileName
 			: Path.Combine(Model.Settings.DownloadFolder, Path.ChangeExtension($"{CurrentFile.DisplayName}-{CurrentFile.Id}", ".dat"));
 		SaveCore(savePath, new SaveParameters(SaveType.DAT, ObjectDatHeaderViewModel?.DatEncoding));
+
+		// Upload metadata to server when in online mode
+		if (CurrentFile.FileLocation == FileLocation.Online && CurrentFile.Id.HasValue && MetadataViewModel != null)
+		{
+			_ = UploadMetadataAsync(CurrentFile.Id.Value);
+		}
+	}
+
+	async Task UploadMetadataAsync(UniqueObjectId objectId)
+	{
+		if (MetadataViewModel?.Metadata == null)
+		{
+			logger.Warning("Cannot upload metadata - metadata is null");
+			return;
+		}
+
+		if (CurrentObject?.DatInfo == null)
+		{
+			logger.Warning("Cannot upload metadata - DatInfo is null");
+			return;
+		}
+
+		try
+		{
+			logger.Info($"Uploading metadata for object {objectId}");
+
+			// Create DTO from current metadata
+			var dtoRequest = new DtoObjectDescriptor(
+				Id: objectId,
+				Name: MetadataViewModel.Metadata.InternalName,
+				DisplayName: CurrentFile.DisplayName,
+				DatChecksum: CurrentObject.DatInfo.S5Header.Checksum,
+				Description: MetadataViewModel.Metadata.Description,
+				ObjectSource: CurrentObject.DatInfo.S5Header.ObjectSource.Convert(
+					CurrentObject.DatInfo.S5Header.Name, 
+					CurrentObject.DatInfo.S5Header.Checksum),
+				ObjectType: CurrentObject.DatInfo.S5Header.ObjectType.Convert(),
+				VehicleType: null,
+				Availability: MetadataViewModel.Metadata.Availability,
+				CreatedDate: MetadataViewModel.Metadata.CreatedDate.HasValue 
+					? DateOnly.FromDateTime(MetadataViewModel.Metadata.CreatedDate.Value.UtcDateTime) 
+					: null,
+				ModifiedDate: MetadataViewModel.Metadata.ModifiedDate.HasValue 
+					? DateOnly.FromDateTime(MetadataViewModel.Metadata.ModifiedDate.Value.UtcDateTime) 
+					: null,
+				UploadedDate: DateOnly.FromDateTime(MetadataViewModel.Metadata.UploadedDate.UtcDateTime),
+				Licence: MetadataViewModel.Metadata.Licence,
+				Authors: MetadataViewModel.Metadata.Authors,
+				Tags: MetadataViewModel.Metadata.Tags,
+				ObjectPacks: MetadataViewModel.Metadata.ObjectPacks,
+				DatObjects: MetadataViewModel.Metadata.DatObjects,
+				StringTable: new DtoStringTableDescriptor(new Dictionary<string, Dictionary<LanguageId, string>>(), objectId)
+			);
+
+			var result = await Model.ObjectServiceClient.UpdateObjectAsync(objectId, dtoRequest);
+
+			if (result != null)
+			{
+				logger.Info($"Successfully uploaded metadata for object {objectId}");
+			}
+			else
+			{
+				logger.Error($"Failed to upload metadata for object {objectId}");
+			}
+		}
+		catch (Exception ex)
+		{
+			logger.Error($"Error uploading metadata for object {objectId}", ex);
+		}
 	}
 
 	public override string? SaveAs(SaveParameters saveParameters)