Added new vertical display style

Author: MattEqualsCoder

MSURandomizer/MSURandomizer.csproj

@@ -7,7 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <PackageIcon>MSURandomizerIcon.ico</PackageIcon>
-        <Version>2.0.0-beta.3</Version>
+        <Version>2.0.0-rc.1</Version>
         <ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
     </PropertyGroup>
 

MSURandomizerLibrary/Configs/Track.cs

@@ -33,6 +33,7 @@ public Track(string trackName, int number, string songName, string path, string?
         TrackName = trackName;
         Number = number;
         OriginalTrackNumber = number;
+        OriginalTrackName = trackName;
         SongName = songName;
         Path = path;
         Artist = artist;
@@ -55,6 +56,7 @@ public Track(Track other, int? number = null, string? path = null, string? track
         TrackName = trackName ?? other.TrackName;
         Number = number ?? other.Number;
         OriginalTrackNumber = other.OriginalTrackNumber;
+        OriginalTrackName = other.TrackName;
         SongName = other.SongName;
         Path = path ?? other.Path;
         Artist = other.Artist;
@@ -142,6 +144,11 @@ public Track(Track other, int? number = null, string? path = null, string? track
     /// The number the track was shuffled as
     /// </summary>
     public int OriginalTrackNumber { get; set; }
+
+    /// <summary>
+    /// The name the track was shuffled as
+    /// </summary>
+    public string OriginalTrackName { get; set; } = "";
 
     /// <summary>
     /// The MSU this track is currently part of
@@ -222,6 +229,15 @@ public string GetDisplayText(TrackDisplayFormat format)
                     .AddArtist("Artist: {0}")
                     .ToString("\r\n");
             }
+            case TrackDisplayFormat.VerticalWithOriginalTrackName:
+            {
+                return builder.AddMsuNameAndCreator("MSU: {0}")
+                    .AddAlbum("Album: {0}")
+                    .AddSongName("Song: {0}")
+                    .AddArtist("Artist: {0}")
+                    .AddOriginalTrackName("Originally plays for: {0}")
+                    .ToString("\r\n");
+            }
             case TrackDisplayFormat.HorizonalWithMsu:
             {
                 return builder.AddAlbum("{0}:")

MSURandomizerLibrary/MSURandomizerLibrary.csproj

@@ -14,7 +14,7 @@
     <PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
     <IncludeSymbols>False</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>2.0.0-beta.3</Version>
+    <Version>2.0.0-rc.1</Version>
     <PackageId>MattEqualsCoder.MSURandomizer.Library</PackageId>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <TargetFramework>net8.0</TargetFramework>

MSURandomizerLibrary/TrackDisplayFormat.cs

@@ -19,6 +19,12 @@ public enum TrackDisplayFormat
     /// </summary>
     [Description("Multiple lines: MSU/album/song/artist")]
     Vertical,
+    
+    /// <summary>
+    /// Vertical style: separate lines for separate tracks, with MSU pack info.
+    /// </summary>
+    [Description("Multiple lines (including original track): MSU/album/song/artist/original track name")]
+    VerticalWithOriginalTrackName,
 
     /// <summary>
     /// Horizontal style: displays the current track with MSU pack info.

MSURandomizerLibrary/TrackDisplayTextBuilder.cs

@@ -67,6 +67,16 @@ public TrackDisplayTextBuilder AddMsuCreator(string format, string? fallback = "
 
         return this;
     }
+    
+    public TrackDisplayTextBuilder AddOriginalTrackName(string format, string? fallback = "")
+    {
+        if (!string.IsNullOrEmpty(track.OriginalTrackName) && track.OriginalTrackName != track.TrackName)
+        {
+            _parts.Add(string.Format(format, track.OriginalTrackName));
+        }
+
+        return this;
+    }
 
     public string ToString(string divider) => string.Join(divider, _parts);
 

MSURandomizerUI/MSURandomizerUI.csproj

@@ -6,7 +6,7 @@
     <UseWPF>true</UseWPF>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>MattEqualsCoder.MSURandomizer.UI</PackageId>
-    <Version>2.0.0-beta.3</Version>
+    <Version>2.0.0-rc.1</Version>
     <PackageProjectUrl>https://github.com/MattEqualsCoder/MSURandomizer</PackageProjectUrl>
     <RepositoryUrl>https://github.com/MattEqualsCoder/MSURandomizer</RepositoryUrl>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>