remove object availability as it did nothing

LeftofZen · LeftofZen · commit 96d62e2b3eca · 2025-05-30T11:54:25.000+10:00
diff --git a/DataSanitiser/Program.cs b/DataSanitiser/Program.cs
@@ -146,7 +146,7 @@ void AddNewObjectMetadataEntries()
 
 		if (!objectMetadata.ContainsKey(key))
 		{
-			objectMetadata.Add(key, new ObjectMetadata(Path.GetFileNameWithoutExtension(obj.Filename), obj.DatName, obj.DatChecksum, null, [], [], [], null, OpenLoco.Definitions.ObjectAvailability.AllGames, DateTimeOffset.Now, null, DateTimeOffset.Now, source));
+			objectMetadata.Add(key, new ObjectMetadata(Path.GetFileNameWithoutExtension(obj.Filename), obj.DatName, obj.DatChecksum, null, [], [], [], null, DateTimeOffset.Now, null, DateTimeOffset.Now, source));
 		}
 	}
 
diff --git a/DatabaseExporter/Program.cs b/DatabaseExporter/Program.cs
@@ -113,7 +113,6 @@
 		o.Tags.Select(t => t.Name).ToList(),
 		o.Packs.Select(m => m.Name).ToList(),
 		o.Object.Licence?.Name,
-		o.Object.Availability,
 		o.Object.CreationDate,
 		o.Object.LastEditDate,
 		o.Object.UploadDate,
diff --git a/DatabaseImporter/Program.cs b/DatabaseImporter/Program.cs
@@ -1,9 +1,7 @@
 using Common.Json;
 using Microsoft.EntityFrameworkCore;
 using OpenLoco.Common.Logging;
-using OpenLoco.Dat;
 using OpenLoco.Dat.Data;
-using OpenLoco.Definitions;
 using OpenLoco.Definitions.Database;
 using OpenLoco.Definitions.SourceData;
 using System.Text.Json;
@@ -207,7 +205,7 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 			var metadataKey = (objIndex.DatName, objIndex.DatChecksum);
 			if (!objectMetadataDict.TryGetValue(metadataKey, out var meta))
 			{
-				var newMetadata = new ObjectMetadata(Guid.NewGuid().ToString(), objIndex.DatName, objIndex.DatChecksum, null, [], [], [], null, ObjectAvailability.AllGames, DateTimeOffset.Now, null, DateTimeOffset.Now, ObjectSource.Custom);
+				var newMetadata = new ObjectMetadata(Guid.NewGuid().ToString(), objIndex.DatName, objIndex.DatChecksum, null, [], [], [], null, DateTimeOffset.Now, null, DateTimeOffset.Now, ObjectSource.Custom);
 				meta = newMetadata;
 				objectMetadataDict.Add((objIndex.DatName, objIndex.DatChecksum), newMetadata);
 			}
@@ -237,7 +235,6 @@ static void SeedDb(LocoDb db, bool deleteExisting)
 				UploadDate = DateTimeOffset.Now,
 				Tags = tags ?? [],
 				ObjectPacks = objectPacks ?? [],
-				Availability = meta!.ObjectAvailability,
 				Licence = licence,
 			};
 
diff --git a/Definitions/DTO/DtoDatObjectWithMetadata.cs b/Definitions/DTO/DtoDatObjectWithMetadata.cs
@@ -20,6 +20,5 @@ public record DtoObjectDescriptorWithMetadata(
 		DateTimeOffset UploadDate,
 		ICollection<TblTag> Tags,
 		ICollection<TblLocoObjectPack> ObjectPacks,
-		ObjectAvailability Availability,
 		TblLicence? Licence);
 }
diff --git a/Definitions/DTO/DtoExtensions.cs b/Definitions/DTO/DtoExtensions.cs
@@ -13,7 +13,6 @@ public static DtoObjectDescriptor ToDtoDescriptor(this TblLocoObject x)
 				x.ObjectSource,
 				x.ObjectType,
 				x.VehicleType,
-				x.Availability,
 				x.Name,
 				x.Description,
 				x.CreationDate,
diff --git a/Definitions/DTO/DtoObjectDescriptor.cs b/Definitions/DTO/DtoObjectDescriptor.cs
@@ -10,7 +10,6 @@ public record DtoObjectDescriptor(
 		ObjectSource ObjectSource,
 		ObjectType ObjectType,
 		VehicleType? VehicleType,
-		ObjectAvailability ObjectAvailability,
 		string InternalName,
 		string? Description,
 		DateTimeOffset? CreationDate,
diff --git a/Definitions/Database/TblLocoObject.cs b/Definitions/Database/TblLocoObject.cs
@@ -21,8 +21,6 @@ public class TblLocoObject : DbCoreObject
 
 		public VehicleType? VehicleType { get; set; }
 
-		public ObjectAvailability Availability { get; set; }
-
 		public ICollection<TblLocoObjectPack> ObjectPacks { get; set; } // aka modpack
 	}
 }
diff --git a/Definitions/ObjectAvailability.cs b/Definitions/ObjectAvailability.cs
diff --git a/Definitions/SourceData/ObjectMetadata.cs b/Definitions/SourceData/ObjectMetadata.cs
@@ -11,7 +11,6 @@ public record ObjectMetadata(
 		List<string> Tags,
 		List<string> ObjectPacks,
 		string? Licence,
-		ObjectAvailability ObjectAvailability,
 		DateTimeOffset? CreationDate,
 		DateTimeOffset? LastEditDate,
 		DateTimeOffset UploadDate,
diff --git a/Gui/Models/MetadataModel.cs b/Gui/Models/MetadataModel.cs
@@ -1,4 +1,3 @@
-using OpenLoco.Definitions;
 using OpenLoco.Definitions.Database;
 using System;
 using System.Collections.Generic;
@@ -32,8 +31,6 @@ public class MetadataModel(string uniqueName, string datName, uint datChecksum)
 		[Browsable(false)]
 		public ICollection<TblLocoObjectPack> ObjectPacks { get; set; }
 
-		public ObjectAvailability Availability { get; set; }
-
 		public TblLicence? Licence { get; set; }
 	}
 }
diff --git a/Gui/Models/ObjectEditorModel.cs b/Gui/Models/ObjectEditorModel.cs
@@ -264,7 +264,6 @@ bool TryLoadOnlineFile(FileSystemItemBase filesystemItem, out UiDatLocoFile? loc
 					UploadDate = cachedLocoObjDto.UploadDate,
 					Tags = cachedLocoObjDto.Tags,
 					ObjectPacks = cachedLocoObjDto.ObjectPacks,
-					Availability = cachedLocoObjDto.Availability,
 					Licence = cachedLocoObjDto.Licence,
 				};
 
diff --git a/Gui/Views/DatObjectEditorView.axaml b/Gui/Views/DatObjectEditorView.axaml
@@ -31,6 +31,11 @@
 						<Setter Property="FontSize" Value="14"/>
 					</Style>
 				</TabControl.Styles>
+				<TabItem Header="{Binding ExtraContentViewModelTabName}">
+					<DockPanel>
+						<ContentControl Content="{Binding ExtraContentViewModel}" />
+					</DockPanel>
+				</TabItem>
 				<TabItem Header="Object">
 					<ScrollViewer>
 						<ContentControl Content="{Binding CurrentObjectViewModel}" />
@@ -61,11 +66,6 @@
 					</DockPanel>
 				</TabItem>
 
-				<TabItem Header="{Binding ExtraContentViewModelTabName}">
-					<DockPanel>
-						<ContentControl Content="{Binding ExtraContentViewModel}" />
-					</DockPanel>
-				</TabItem>
 
 				<TabItem Header="Metadata">
 					<Border Background="{DynamicResource ExpanderContentBackground}" Margin="8">
@@ -103,9 +103,6 @@
 								<TextBlock Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Text="Upload Date" Margin="4"/>
 								<DatePicker Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" SelectedDate="{Binding UploadDate}" IsEnabled="False" Margin="4" />
 
-								<TextBlock Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" Text="Availability" Margin="4"/>
-								<TextBox Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" Text="{Binding Availability}" IsReadOnly="True" Margin="4" />
-
 								<TextBlock Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" Text="Licence" Margin="4"/>
 								<TextBox Grid.Row="7" Grid.Column="1" VerticalAlignment="Center" Text="{Binding Licence.Name}" IsReadOnly="True" Margin="4" />
 							</Grid>
diff --git a/ObjectService/Server.cs b/ObjectService/Server.cs
@@ -6,7 +6,6 @@
 using OpenLoco.Dat.Data;
 using OpenLoco.Dat.FileParsing;
 using OpenLoco.Dat.Objects;
-using OpenLoco.Definitions;
 using OpenLoco.Definitions.Database;
 using OpenLoco.Definitions.DTO;
 using OpenLoco.Definitions.SourceData;
@@ -253,7 +252,6 @@ async Task<IResult> ReturnObject(bool? returnObjBytes, ILogger<Server> logger, E
 				obj.UploadDate,
 				eObj.Tags,
 				eObj.Packs,
-				obj.Availability,
 				obj.Licence);
 
 			return Results.Ok(dtoObject);
@@ -464,7 +462,6 @@ public async Task<IResult> UploadDat(DtoUploadDat request, LocoDb db, [FromServi
 				UploadDate = DateTimeOffset.UtcNow,
 				Tags = [],
 				ObjectPacks = [],
-				Availability = LocoObject == null ? ObjectAvailability.Unavailable : ObjectAvailability.AllGames,
 				Licence = null,
 			};
 

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ void AddNewObjectMetadataEntries()`
`146`	`146`
`147`	`147`	`if (!objectMetadata.ContainsKey(key))`
`148`	`148`	`{`
`149`		`- objectMetadata.Add(key, new ObjectMetadata(Path.GetFileNameWithoutExtension(obj.Filename), obj.DatName, obj.DatChecksum, null, [], [], [], null, OpenLoco.Definitions.ObjectAvailability.AllGames, DateTimeOffset.Now, null, DateTimeOffset.Now, source));`
	`149`	`+ objectMetadata.Add(key, new ObjectMetadata(Path.GetFileNameWithoutExtension(obj.Filename), obj.DatName, obj.DatChecksum, null, [], [], [], null, DateTimeOffset.Now, null, DateTimeOffset.Now, source));`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,5 @@ public record DtoObjectDescriptorWithMetadata(`
`20`	`20`	`DateTimeOffset UploadDate,`
`21`	`21`	`ICollection<TblTag> Tags,`
`22`	`22`	`ICollection<TblLocoObjectPack> ObjectPacks,`
`23`		`- ObjectAvailability Availability,`
`24`	`23`	`TblLicence? Licence);`
`25`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ public class TblLocoObject : DbCoreObject`
`21`	`21`
`22`	`22`	`public VehicleType? VehicleType { get; set; }`
`23`	`23`
`24`		`- public ObjectAvailability Availability { get; set; }`
`25`		`-`
`26`	`24`	`public ICollection<TblLocoObjectPack> ObjectPacks { get; set; } // aka modpack`
`27`	`25`	`}`
`28`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using OpenLoco.Definitions;`
`2`	`1`	`using OpenLoco.Definitions.Database;`
`3`	`2`	`using System;`
`4`	`3`	`using System.Collections.Generic;`
`@@ -32,8 +31,6 @@ public class MetadataModel(string uniqueName, string datName, uint datChecksum)`
`32`	`31`	`[Browsable(false)]`
`33`	`32`	`public ICollection<TblLocoObjectPack> ObjectPacks { get; set; }`
`34`	`33`
`35`		`- public ObjectAvailability Availability { get; set; }`
`36`		`-`
`37`	`34`	`public TblLicence? Licence { get; set; }`
`38`	`35`	`}`
`39`	`36`	`}`