update core dependencies

README.md

@@ -2,8 +2,8 @@
 
 <img height="600" alt="image" src="https://github.com/user-attachments/assets/2a06c9b4-6b37-43eb-a7f5-3b2d4577c736" />
 
-
-
 This is a rewrite of [WacK-Repackager](https://github.com/muskit/WacK-Repackager) to work with the upcoming Saturn project.
 
+**If this program does not run, make sure [.NET 9.0+](https://dotnet.microsoft.com/en-us/download) is installed.**
+
 Head over to [HOWTO](HOWTO.md) for required data preparation.

build-and-package.sh

@@ -3,12 +3,13 @@
 cd $(dirname $0)
 
 app_version=MercuryConverter-v$(cat src/Assets/version)
+echo Building $app_version
 
 # create builds
-dotnet publish src --runtime linux-x64 -c Release -p:PublishSingleFile=True -o "./builds/$app_version-linux-x64"
+dotnet publish src --runtime linux-x64 -c Release -p:PublishSingleFile=True --self-contained false -o "./builds/$app_version-linux-x64" &&
-dotnet publish src --runtime win-x64 -c Release -p:PublishSingleFile=True -o "./builds/$app_version-win-x64"
+dotnet publish src --runtime win-x64 -c Release -p:PublishSingleFile=True --self-contained false -o "./builds/$app_version-win-x64" &&
 
 # package builds
-cd builds
+cd builds &&
-zip -r "$app_version-linux-x64.zip" "$app_version-linux-x64"
+zip -r "$app_version-linux-x64.zip" "$app_version-linux-x64" && 
 zip -r "$app_version-win-x64.zip" "$app_version-win-x64"

src/Assets/version

@@ -1 +1 @@
-1.1
+1.11

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));
         }
 

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 ///

src/MercuryConverter.csproj

@@ -6,6 +6,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
+    <ApplicationIcon>../icon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,7 +25,6 @@
     <PackageReference Include="DialogHost.Avalonia" Version="0.9.3" />
     <PackageReference Include="ffmpegcore" Version="5.2.0" />
     <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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">

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)