From 534ec95e63c05c52016e3561f56677fa8cdac5bc Mon Sep 17 00:00:00 2001
From: Alex <15199219+muskit@users.noreply.github.com>
Date: Mon, 10 Nov 2025 21:55:47 -0800
Subject: [PATCH] update core dependencies

---
 _External/SaturnData                      |  2 +-
 _External/UAssetAPI                       |  2 +-
 src/Assets/version                        |  2 +-
 src/Data/Song/Song.cs                     | 16 ++++++++++------
 src/ExportOperation/Exporter.cs           |  6 +++---
 src/UI/Views/Selection/Selection.axaml    |  2 +-
 src/UI/Views/Selection/Selection.axaml.cs |  8 ++++++++
 7 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/_External/SaturnData b/_External/SaturnData
index 9c25652..6eb7ce9 160000
--- a/_External/SaturnData
+++ b/_External/SaturnData
@@ -1 +1 @@
-Subproject commit 9c25652c01e507208ae3ece682778dc8288e6295
+Subproject commit 6eb7ce9c04774697e45536f5810a087692bab8bf
diff --git a/_External/UAssetAPI b/_External/UAssetAPI
index ec758cf..8aa90ad 160000
--- a/_External/UAssetAPI
+++ b/_External/UAssetAPI
@@ -1 +1 @@
-Subproject commit ec758cff144c68cbd4f18867aff9469bb05af506
+Subproject commit 8aa90add4da7bc17be87229044d02b3b94247ecf
diff --git a/src/Assets/version b/src/Assets/version
index b123147..b816207 100644
--- a/src/Assets/version
+++ b/src/Assets/version
@@ -1 +1 @@
-1.1
\ No newline at end of file
+1.11
\ No newline at end of file
diff --git a/src/Data/Song/Song.cs b/src/Data/Song/Song.cs
index 63a2438..e5fddca 100644
--- a/src/Data/Song/Song.cs
+++ b/src/Data/Song/Song.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using MercuryConverter.Utility;
@@ -65,25 +66,29 @@ public class Song
             var chartFilePath = Path.Combine(Settings.I!.DataPath, "MusicData", Id, $"{Id}_{Consts.DIFF_FILENAME_APPEND[diff]}.mer");
             var clearThreshold = ((FloatPropertyData)assetData[Consts.DIFF_CLEAR_KEY[diff]]).Value;
 
+            var c = NotationSerializer.ToChart(chartFilePath, new NotationReadArgs { }, out var chExcs);
+            // TODO: check exceptions
+
             var e = NotationSerializer.ToEntry(chartFilePath, new NotationReadArgs
             {
                 InferClearThresholdFromDifficulty = false,
-            });
+            }, out var exportExcs);
+            // TODO: check exceptions
+
+            c.Build(e); // set timings as appropriate
             e.Title = Name;
             e.Reading = Rubi;
             e.Artist = Artist;
             e.BpmMessage = BpmMessage;
-            e.PreviewBegin = PreviewTime * 1000f;
-            e.PreviewLength = PreviewLen * 1000f;
             e.ClearThreshold = clearThreshold;
             e.Difficulty = diff;
             e.Level = l.Value.Item1;
             e.NotesDesigner = l.Value.Item2;
-            e.JacketPath = "jacket.png";
+            e.JacketFile = "jacket.png";
 
             // TODO: video
 
-            e.Guid = $"MERCURY_{Uid}_0{(int)diff}";
+            e.Id = $"MERCURY_{Uid}_0{(int)diff}";
 
             if (new List<uint> { 1, 2 }.Contains(Source))
             {
@@ -98,7 +103,6 @@ public class Song
                 e.Background = BackgroundOption.Version3;
             }
 
-            var c = NotationSerializer.ToChart(chartFilePath, new NotationReadArgs { });
             ret.Add((e, c));
         }
 
diff --git a/src/ExportOperation/Exporter.cs b/src/ExportOperation/Exporter.cs
index f78dfcf..4bc9f36 100644
--- a/src/ExportOperation/Exporter.cs
+++ b/src/ExportOperation/Exporter.cs
@@ -70,7 +70,7 @@ public class Exporter
                 }
                 finishedAudio.Add(audioKey);
             }
-            ec.Item1.AudioPath = audioExportFileName;
+            ec.Item1.AudioFile = audioExportFileName;
 
             /// VIDEO ///
             // mv_... = set video
@@ -97,7 +97,7 @@ public class Exporter
 
                         finishedMovies.Add(movie);
                     }
-                    ec.Item1.VideoPath = vidFileName;
+                    ec.Item1.VideoFile = vidFileName;
                 }
                 prevMovie = movie;
             }
@@ -115,7 +115,7 @@ public class Exporter
                 new NotationWriteArgs { FormatVersion = options.ChartFormat }
             );
             // restore audio key in db AFTER exporting metadata
-            ec.Item1.AudioPath = audioKey;
+            ec.Item1.AudioFile = audioKey;
         }
 
         /// JACKET ///
diff --git a/src/UI/Views/Selection/Selection.axaml b/src/UI/Views/Selection/Selection.axaml
index e7c49cd..3fb8ada 100644
--- a/src/UI/Views/Selection/Selection.axaml
+++ b/src/UI/Views/Selection/Selection.axaml
@@ -52,7 +52,7 @@
                         <DataGridTextColumn Header="ID" Width="90" Binding="{Binding Id}"/>
                         <DataGridTextColumn Header="Title" Width="*" Binding="{Binding Name}"/>
                         <DataGridTextColumn Header="Artist" Width="*" Binding="{Binding Artist}"/>
-                        <DataGridTextColumn Header="Version Released" Width="150" Binding="{Binding SourceName}" SortMemberPath="Source"/>
+                        <DataGridTextColumn Header="Version Released" Width="160" Binding="{Binding SourceName}" SortMemberPath="Source"/>
                     </DataGrid.Columns>
                     <DataGrid.Styles>
                         <Style Selector="DataGridCell">
diff --git a/src/UI/Views/Selection/Selection.axaml.cs b/src/UI/Views/Selection/Selection.axaml.cs
index cf20f53..213cb34 100644
--- a/src/UI/Views/Selection/Selection.axaml.cs
+++ b/src/UI/Views/Selection/Selection.axaml.cs
@@ -74,6 +74,14 @@ public partial class Selection : Panel
                 (Song)e.AddedItems[e.AddedItems.Count - 1]! :
                 (Song)ListingTable.SelectedItems[ListingTable.SelectedItems.Count - 1]!;
 
+            // Debug: Saturn GUIDs
+            var ecs = song.GetEntryCharts();
+            foreach (var (entry, _) in ecs)
+            {
+                Console.WriteLine(entry.Id);
+            }
+            
+            // TODO: song preview playback
             Dispatcher.UIThread.Post(() =>
             {
                 if (song.Jacket != null)