Remove the SaintCoinach Schema

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.x.x'
+          dotnet-version: '8.x.x'
       - name: Define Version
         id: define-version
         run: |

DotSquish/DotSquish.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{F9681545-4BEA-4FD3-9AB9-A67BD37AB36D}</ProjectGuid>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

Godbert/Controls/ColumnFactory.cs

@@ -18,7 +18,7 @@ public static DataGridColumn Create(RelationalColumn column) {
             var sheetDef = column.Header.SheetDefinition;
             Type defType = null;
             if (sheetDef != null)
-                defType = sheetDef.GetValueType(column.Index);
+                defType = sheetDef.GetValueType(column.ColumnBasedIndex);
             var targetType = defType ?? column.Reader.Type;
 
             var header = BuildHeader(column);
@@ -47,7 +47,7 @@ public static DataGridColumn Create(RelationalColumn column) {
         private static string BuildHeader(RelationalColumn column) {
             var sb = new StringBuilder();
 
-            sb.Append(column.Index);
+            sb.Append(column.ColumnBasedIndex);
             if (!string.IsNullOrWhiteSpace(column.Name))
                 sb.AppendFormat(": {0}", column.Name);
             sb.Append(Environment.NewLine);
@@ -68,7 +68,7 @@ private static string BuildHeader(RelationalColumn column) {
         private static Binding CreateCellBinding(RelationalColumn column) {
             return new Binding {
                 Converter = CellConverterInstance,
-                ConverterParameter = column.Index,
+                ConverterParameter = column.ColumnBasedIndex,
                 Mode = BindingMode.OneWay
             };
         }

Godbert/Controls/RawDataGrid.cs

@@ -132,7 +132,7 @@ cellHeader.Column is RawDataGridTextColumn ||
                         cellHeader.Column is RawDataGridColorColumn)
                     {
 
-                        var columnIndex = ((IRawDataColumn) cellHeader.Column).Column.Index;
+                        var columnIndex = ((IRawDataColumn) cellHeader.Column).Column.ColumnBasedIndex;
                         ColumnSetToRaw[columnIndex] = !ColumnSetToRaw[columnIndex];
                         Items.Refresh();
                         e.Handled = true;
@@ -167,7 +167,7 @@ cellHeader.Column is RawDataGridTextColumn ||
                     Key = row.Key,
                     RowDefault = row.ToString(),
                     ColumnName = dataColumn.Column?.Name,
-                    ColumnIndex = dataColumn.Column?.Index
+                    ColumnIndex = dataColumn.Column?.ColumnBasedIndex
                 };
 
                 if (dataViewModel.Bookmarks.Contains(bookmark)) {
@@ -236,7 +236,7 @@ public void SelectRow(IRow row, int? columnIndex) {
 
             DataGridColumn selectedColumn = null;
             if (columnIndex != null)
-                selectedColumn = (DataGridColumn)this.Columns.OfType<IRawDataColumn>().FirstOrDefault(c => c.Column?.Index == columnIndex);
+                selectedColumn = (DataGridColumn)this.Columns.OfType<IRawDataColumn>().FirstOrDefault(c => c.Column?.ColumnBasedIndex == columnIndex);
 
             this.ScrollIntoView(this.SelectedItem, selectedColumn);
         }

Godbert/Controls/RawDataGridColorColumn.cs

@@ -120,8 +120,8 @@ private int InnerCompare(object x, object y) {
                 if (ry == null)
                     return 1;
 
-                var vx = rx[Column.Index];
-                var vy = ry[Column.Index];
+                var vx = rx[Column.ColumnBasedIndex];
+                var vy = ry[Column.ColumnBasedIndex];
 
                 if (vx == vy)
                     return 0;

Godbert/Controls/RawDataGridImageColumn.cs

@@ -36,7 +36,7 @@ void OnSaveImageClick(object sender, RoutedEventArgs e) {
             if (ctx == null)
                 return;
 
-            var img = ctx[_Column.Index] as SaintCoinach.Imaging.ImageFile;
+            var img = ctx[_Column.ColumnBasedIndex] as SaintCoinach.Imaging.ImageFile;
             if (img == null)
                 return;
 
@@ -118,8 +118,8 @@ private int InnerCompare(object x, object y) {
                 if (ry == null)
                     return 1;
 
-                var vx = rx[Column.Index] as SaintCoinach.Imaging.ImageFile;
-                var vy = ry[Column.Index] as SaintCoinach.Imaging.ImageFile;
+                var vx = rx[Column.ColumnBasedIndex] as SaintCoinach.Imaging.ImageFile;
+                var vy = ry[Column.ColumnBasedIndex] as SaintCoinach.Imaging.ImageFile;
 
                 if (vx == vy)
                     return 0;

Godbert/Controls/RawDataGridTextColumn.cs

@@ -34,7 +34,7 @@ void OnCopyClick(object sender, RoutedEventArgs e) {
             if (ctx == null)
                 return;
 
-            var val = ctx[_Column.Index];
+            var val = ctx[_Column.ColumnBasedIndex];
             if (val == null)
                 return;
 
@@ -50,7 +50,7 @@ public IRow OnNavigate(object sender, RoutedEventArgs e) {
             if (ctx == null)
                 return null;
 
-            return ctx[_Column.Index] as IRow;
+            return ctx[_Column.ColumnBasedIndex] as IRow;
         }
 
         protected override FrameworkElement GenerateElement(DataGridCell cell, object dataItem) {
@@ -94,8 +94,8 @@ private int InnerCompare(object x, object y) {
                     return 1;
 
 
-                var vx = ColumnFactory.ForceRaw || RawDataGrid.ColumnSetToRaw[Column.Index] ? rx.GetRaw(Column.Index) : rx[Column.Index];
-                var vy = ColumnFactory.ForceRaw || RawDataGrid.ColumnSetToRaw[Column.Index] ? ry.GetRaw(Column.Index) : ry[Column.Index];
+                var vx = ColumnFactory.ForceRaw || RawDataGrid.ColumnSetToRaw[Column.ColumnBasedIndex] ? rx.GetRaw(Column.ColumnBasedIndex) : rx[Column.ColumnBasedIndex];
+                var vy = ColumnFactory.ForceRaw || RawDataGrid.ColumnSetToRaw[Column.ColumnBasedIndex] ? ry.GetRaw(Column.ColumnBasedIndex) : ry[Column.ColumnBasedIndex];
 
                 if (vx == vy)
                     return 0;

Godbert/Godbert.csproj

@@ -3,7 +3,7 @@
     <ProjectGuid>{6A5DA7FF-791E-4A43-BF65-B6942917F7D9}</ProjectGuid>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

Godbert/MainWindow.xaml

@@ -8,8 +8,8 @@
     <Window.DataContext>
         <vm:MainViewModel />
     </Window.DataContext>
-    <DockPanel LastChildFill="True">
-        <Menu DockPanel.Dock="Top">
+    <DockPanel>
+        <Menu DockPanel.Dock="Top" HorizontalAlignment="Stretch">
             <MenuItem Header="Language">
                 <MenuItem Header="English"
                           IsChecked="{Binding Path=IsEnglish, Mode=OneWay}"
@@ -51,6 +51,8 @@
                           IsChecked="{Binding Path=SortByOffsets, Mode=OneWay}"
                           Command="{Binding Path=SortByOffsetsCommand}" />
             </MenuItem>
+            <MenuItem Header="{Binding Realm.GameVersion}" HeaderStringFormat="Game: {0}" IsEnabled="False" HorizontalAlignment="Right"/>
+            <MenuItem Header="{Binding Realm.DefinitionVersion}" HeaderStringFormat="Definition: {0}" IsEnabled="False" HorizontalAlignment="Right" />
         </Menu>
         <TabControl>
             <TabItem Header="Data" DataContext="{Binding Path=Data}">

Godbert/MainWindow.xaml.cs

@@ -1,18 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Godbert {
     /// <summary>

Godbert/ViewModels/DataViewModel.cs

@@ -133,11 +133,11 @@ static void SaveAsCsv(IRelationalSheet sheet, string path) {
 
                 var colIndices = new List<int>();
                 foreach (var col in sheet.Header.Columns) {
-                    indexLine.AppendFormat(",{0}", col.Index);
+                    indexLine.AppendFormat(",{0}", col.ColumnBasedIndex);
                     nameLine.AppendFormat(",{0}", col.Name);
                     typeLine.AppendFormat(",{0}", col.ValueType);
 
-                    colIndices.Add(col.Index);
+                    colIndices.Add(col.ColumnBasedIndex);
                 }
 
                 s.WriteLine(indexLine);

Godbert/ViewModels/MainViewModel.cs

@@ -1,11 +1,13 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-
+using System.Windows.Forms;
 using System.Windows.Input;
+using Cursors = System.Windows.Input.Cursors;
 
 namespace Godbert.ViewModels {
     using Commands;
@@ -50,6 +52,18 @@ public MainViewModel() {
             foreach (var language in languages) {
                 try {
                     var realm = new ARealmReversed(Properties.Settings.Default.GamePath, language);
+
+                    if (realm.IsUpdateAvailable()) {
+                        var result = MessageBox.Show("A definition update is available, download now?", "Update available", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                        if (result == DialogResult.Yes) {
+                            var time = Stopwatch.StartNew();
+                            realm.UpdateDefinition();
+                            MessageBox.Show($"Updated in {TimeSpan.FromMilliseconds(time.ElapsedMilliseconds):c}\nPlease restart the application.", "Update complete", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                            Environment.Exit(0);
+                        } else
+                            Console.WriteLine("Skipping update.");
+                    }
+
                     Initialize(realm);
                     lastException = null;
                     break;
@@ -140,16 +154,12 @@ private void OnShowOffsetsCommand() {
             Settings.Default.ShowOffsets = !Settings.Default.ShowOffsets;
 
             OnPropertyChanged(() => ShowOffsets);
-
-            DataGridChanged?.Invoke(this, EventArgs.Empty);
         }
 
         private void OnSortByOffsetsCommand() {
             Settings.Default.SortByOffsets = !Settings.Default.SortByOffsets;
 
             OnPropertyChanged(() => SortByOffsets);
-
-            DataGridChanged?.Invoke(this, EventArgs.Empty);
         }
         #endregion
     }

SaintCoinach.Cmd/Commands/SqlExport.cs

@@ -115,7 +115,7 @@ private void WriteVariant1Rows(ISheet sheet, StringBuilder sb)
 
             foreach (var col in sheet.Header.Columns.Cast<RelationalColumn>())
             {
-                string name = string.IsNullOrEmpty(col.Name) ? $"unk{col.Index}" : col.Name;
+                string name = string.IsNullOrEmpty(col.Name) ? $"unk{col.ColumnBasedIndex}" : col.Name;
 
                 cols.Add($"`{name}`");
             }
@@ -144,7 +144,7 @@ private void WriteVairant2Rows(ISheet sheet, StringBuilder sb)
 
             foreach (var col in sheet.Header.Columns.Cast<RelationalColumn>())
             {
-                string name = string.IsNullOrEmpty(col.Name) ? $"unk{col.Index}" : col.Name;
+                string name = string.IsNullOrEmpty(col.Name) ? $"unk{col.ColumnBasedIndex}" : col.Name;
 
                 cols.Add($"`{name}`");
             }
@@ -208,7 +208,7 @@ public override async Task InvokeAsync(string[] paramList)
                 {
                     var colName = column.Name;
                     if (string.IsNullOrEmpty(colName))
-                        colName = $"unk{column.Index}";
+                        colName = $"unk{column.ColumnBasedIndex}";
 
                     sb.AppendLine($"  `{colName}` {GetSqlType(column.Reader.Type)},");
                 }

SaintCoinach.Cmd/ExdHelper.cs

@@ -21,11 +21,11 @@ public static void SaveAsCsv(Ex.Relational.IRelationalSheet sheet, Language lang
 
                 var colIndices = new List<int>();
                 foreach (var col in sheet.Header.Columns) {
-                    indexLine.AppendFormat(",{0}", col.Index);
+                    indexLine.AppendFormat(",{0}", col.ColumnBasedIndex);
                     nameLine.AppendFormat(",{0}", col.Name);
                     typeLine.AppendFormat(",{0}", col.ValueType);
 
-                    colIndices.Add(col.Index);
+                    colIndices.Add(col.ColumnBasedIndex);
                 }
 
                 s.WriteLine(indexLine);

SaintCoinach.Cmd/Program.cs

@@ -1,20 +1,11 @@
 using System;
+using System.Diagnostics;
 using System.Linq;
 using Tharga.Console;
 using Tharga.Console.Commands;
 using Tharga.Console.Commands.Base;
 
 namespace SaintCoinach.Cmd {
-    class ConsoleProgressReporter : IProgress<Ex.Relational.Update.UpdateProgress> {
-
-        #region IProgress<UpdateProgress> Members
-
-        public void Report(Ex.Relational.Update.UpdateProgress value) {
-            Console.WriteLine(value);
-        }
-
-        #endregion
-    }
     class Program {
         private static void Main(string[] args) {
             var dataPath = Properties.Settings.Default.DataPath;
@@ -32,23 +23,23 @@ private static void Main(string[] args) {
                 return;
             }
 
-            var realm = new ARealmReversed(dataPath, @"SaintCoinach.History.zip", Ex.Language.English, @"app_data.sqlite");
+            var realm = new ARealmReversed(dataPath, Ex.Language.English, @"app_data.sqlite");
             realm.Packs.GetPack(new IO.PackIdentifier("exd", IO.PackIdentifier.DefaultExpansion, 0)).KeepInMemory = true;
 
             Console.WriteLine("Game version: {0}", realm.GameVersion);
             Console.WriteLine("Definition version: {0}", realm.DefinitionVersion);
 
-            if (!realm.IsCurrentVersion) {
-                Console.Write("Update is available, perform update (Y/n)? ");
+            if (realm.IsUpdateAvailable()) {
+                Console.Write("Update is available, download update (Y/n)? ");
                 var updateQuery = Console.ReadLine();
                 if (string.IsNullOrEmpty(updateQuery) || string.Equals("y", updateQuery, StringComparison.OrdinalIgnoreCase)) {
-                    var stopWatch = new System.Diagnostics.Stopwatch();
-                    stopWatch.Start();
-                    realm.Update(true, new ConsoleProgressReporter());
-                    stopWatch.Stop();
-                    Console.WriteLine(stopWatch.Elapsed);
+                    var time = Stopwatch.StartNew();
+                    realm.UpdateDefinition();
+                    Console.WriteLine($"Updated in {TimeSpan.FromMilliseconds(time.ElapsedMilliseconds):c}");
+                    Console.WriteLine($"Please restart the application.");
+                    return;
                 } else
-                    Console.WriteLine("Skipping update");
+                    Console.WriteLine("Skipping update.");
             }
 
             var cns = new Tharga.Console.Consoles.ClientConsole();

SaintCoinach.Cmd/SaintCoinach.Cmd.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProjectGuid>{957699E4-8310-4D1E-BA83-13B7A4932807}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>SaintCoinach.Cmd</AssemblyTitle>
     <Product>SaintCoinach.Cmd</Product>
     <Copyright>Copyright © Rogueadyn 2014</Copyright>

SaintCoinach.Graphics.Viewer/SaintCoinach.Graphics.Viewer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{226BF71E-334F-4585-8FEC-4239704CF539}</ProjectGuid>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <AssemblyTitle>SaintCoinach.Graphics.Viewer</AssemblyTitle>
     <Product>SaintCoinach.Graphics.Viewer</Product>
     <Copyright>Copyright ©  2015</Copyright>

SaintCoinach.sln

@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaintCoinach.Graphics.Viewe
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Godbert", "Godbert\Godbert.csproj", "{6A5DA7FF-791E-4A43-BF65-B6942917F7D9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{B609958F-59B9-4128-8500-13FF8C12B201}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -53,4 +55,7 @@ Global
 		SolutionGuid = {38B9D19B-5177-445E-8E3F-6C69A809DAB9}
 		EnterpriseLibraryConfigurationToolBinariesPathV6 = packages\EnterpriseLibrary.Common.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.Logging.6.0.1304.0\lib\NET45;packages\EnterpriseLibrary.ExceptionHandling.6.0.1304.0\lib\NET45
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{F9681545-4BEA-4FD3-9AB9-A67BD37AB36D} = {B609958F-59B9-4128-8500-13FF8C12B201}
+	EndGlobalSection
 EndGlobal