move objectindex into Definitions

Author: LeftofZen

Dat/Types/GlobalUsings.cs

@@ -0,0 +1,22 @@
+#pragma warning disable IDE0079 // Remove unnecessary suppression
+#pragma warning disable IDE0005 // Using directive is unnecessary.
+
+global using char_t = System.Byte;
+global using coord_t = System.Int16;
+global using image_id = System.UInt32;
+global using int16_t = System.Int16;
+global using int32_t = System.Int32;
+global using int8_t = System.SByte;
+global using MicroZ = System.Byte;
+global using object_id = System.Byte;
+global using size_t = System.UInt32;
+global using SoundObjectId = System.Byte;
+global using Speed16 = System.Int16;
+global using Speed32 = System.Int32;
+global using string_id = System.UInt16;
+global using uint16_t = System.UInt16;
+global using uint32_t = System.UInt32;
+global using uint8_t = System.Byte;
+
+#pragma warning restore IDE0005 // Using directive is unnecessary.
+#pragma warning restore IDE0079 // Remove unnecessary suppression

Dat/Types/Typedefs.cs

@@ -1,19 +1,3 @@
-global using char_t = System.Byte;
-global using coord_t = System.Int16;
-global using image_id = System.UInt32;
-global using int16_t = System.Int16;
-global using int32_t = System.Int32;
-global using int8_t = System.SByte;
-global using MicroZ = System.Byte;
-global using object_id = System.Byte;
-global using size_t = System.UInt32;
-global using SoundObjectId = System.Byte;
-global using Speed16 = System.Int16;
-global using Speed32 = System.Int32;
-global using string_id = System.UInt16;
-global using uint16_t = System.UInt16;
-global using uint32_t = System.UInt32;
-global using uint8_t = System.Byte;
 using OpenLoco.Dat.FileParsing;
 using System.ComponentModel;
 

DataQuery/DataQuery.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Dat\Dat.csproj" />
+    <ProjectReference Include="..\Definitions\Definitions.csproj" />
   </ItemGroup>
 
 </Project>

DataQuery/Program.cs

@@ -1,9 +1,9 @@
 // See https://aka.ms/new-console-template for more information
 using OpenLoco.Common.Logging;
-using OpenLoco.Dat;
 using OpenLoco.Dat.Data;
 using OpenLoco.Dat.FileParsing;
 using OpenLoco.Dat.Objects;
+using OpenLoco.Definitions.Database;
 using System.Reflection;
 
 var dir = "Q:\\Games\\Locomotion\\Server\\Objects";

DataSanitiser/Program.cs

@@ -1,11 +1,11 @@
 // 1. objectMetadata.json must contain a single record for every unique object we have
 using Common.Json;
 using OpenLoco.Common.Logging;
-using OpenLoco.Dat;
 using OpenLoco.Dat.Data;
 using OpenLoco.Dat.FileParsing;
 using OpenLoco.Dat.Objects;
 using OpenLoco.Dat.Types;
+using OpenLoco.Definitions.Database;
 using OpenLoco.Definitions.SourceData;
 using System.Data;
 using System.Text.Json;

DatabaseExporter/Program.cs

@@ -4,10 +4,7 @@
 using OpenLoco.Definitions.SourceData;
 using System.Text.Json;
 
-var builder = new DbContextOptionsBuilder<LocoDb>();
-const string connectionString = "Data Source=Q:\\Games\\Locomotion\\Database\\loco.db";
-_ = builder.UseSqlite(connectionString);
-var db = new LocoDb(builder.Options);
+var db = LocoDb.GetDbFromFile(LocoDb.DefaultDb);
 
 Console.WriteLine("loading");
 

DatabaseImporter/Program.cs

@@ -16,13 +16,10 @@
 
 static LocoDb Seed()
 {
-	var builder = new DbContextOptionsBuilder<LocoDb>();
-	const string connectionString = "Data Source=Q:\\Games\\Locomotion\\Server\\loco.db";
-	_ = builder.UseSqlite(connectionString);
-	var db = new LocoDb(builder.Options);
+	var db = LocoDb.GetDbFromFile(LocoDb.DefaultDb);
 
 	// Note: The database must exist before this script works
-	Console.WriteLine($"Database path: {connectionString}");
+	Console.WriteLine($"Database path: {LocoDb.DefaultDb}");
 
 	const bool seed = true;
 	const bool DeleteExisting = true;

Definitions/Database/LocoDb.cs

@@ -28,14 +28,28 @@ public LocoDb()
 		public LocoDb(DbContextOptions<LocoDb> options) : base(options)
 		{ }
 
-		protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+		public static string DefaultDb = "Q:\\Games\\Locomotion\\Server\\loco.db";
+
+		protected override void OnConfiguring(DbContextOptionsBuilder builder)
 		{
-			if (!optionsBuilder.IsConfigured)
+			if (!builder.IsConfigured)
 			{
-				_ = optionsBuilder.UseSqlite("Data Source=Q:\\Games\\Locomotion\\Server\\loco.db");
+				_ = builder.UseSqlite($"Data Source={DefaultDb}");
 			}
 		}
 
+		public static LocoDb? GetDbFromFile(string path) // path is the full/absolute file path
+		{
+			if (!string.IsNullOrEmpty(path) && File.Exists(path))
+			{
+				var builder = new DbContextOptionsBuilder<LocoDb>();
+				_ = builder.UseSqlite($"Data Source={path}");
+				return new LocoDb(builder.Options);
+			}
+
+			return null;
+		}
+
 		protected override void OnModelCreating(ModelBuilder modelBuilder)
 		{
 			_ = modelBuilder.Entity<TblLocoObject>()

Dat/ObjectIndex.cs renamed to Definitions/Database/ObjectIndex.cs

@@ -8,7 +8,7 @@
 using System.Collections.ObjectModel;
 using System.Text.Json.Serialization;
 
-namespace OpenLoco.Dat
+namespace OpenLoco.Definitions.Database
 {
 	public class ObjectIndex
 	{
@@ -17,6 +17,9 @@ public class ObjectIndex
 		[JsonIgnore]
 		public const string DefaultIndexFileName = "objectIndex.json";
 
+		[JsonIgnore]
+		public const string DefaultIndexDbFileName = "objectIndex.db";
+
 		public ObjectIndex()
 		{ }
 

Definitions/Definitions.csproj

@@ -6,6 +6,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Dat\Types\GlobalUsings.cs" Link="GlobalUsings.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.3">