fix playstate deserialization across restrts

Fooxboy · Apr 12, 2024 · 32e9697 · 32e9697
1 parent 731fb19
commit 32e9697
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/MusicX/Services/Player/Playlists/IPlaylist.cs b/MusicX/Services/Player/Playlists/IPlaylist.cs
@@ -60,9 +60,8 @@ public class PlaylistJsonConverter : JsonConverter<IPlaylist>
         reader.Read();
         var type = reader.GetString();
         reader.Read();
-        reader.Read();
 
-        return type switch
+        IPlaylist? playlist = type switch
         {
             "single" => JsonSerializer.Deserialize<SinglePlaylist>(ref reader, options),
             "list" => JsonSerializer.Deserialize<ListPlaylist>(ref reader, options),
@@ -71,6 +70,11 @@ public class PlaylistJsonConverter : JsonConverter<IPlaylist>
             "vkPlaylist" => JsonSerializer.Deserialize<VkPlaylistPlaylist>(ref reader, options),
             _ => throw new JsonException("Unsupported playlist type.")
         };
+
+        if (playlist is null || !reader.Read())
+            throw new JsonException("Unexpected end when reading playlist.");
+
+        return playlist;
     }
 
     public override void Write(Utf8JsonWriter writer, IPlaylist value, JsonSerializerOptions options)

diff --git a/MusicX/Views/StartingWindow.xaml.cs b/MusicX/Views/StartingWindow.xaml.cs
@@ -190,7 +190,7 @@ await container.GetRequiredService<IVkApiAuthAsync>()
                                     var playArgIndex = Array.BinarySearch(_args, "--play",
                                         StringComparer.OrdinalIgnoreCase);
                                     if (playArgIndex >= 0 && playArgIndex + 1 < _args.Length &&
-                                        JsonSerializer.Deserialize<PlayerState>(_args[playArgIndex + 1]) is { } state)
+                                        JsonSerializer.Deserialize<PlayerState>(string.Join(string.Empty, _args[(playArgIndex + 1)..])) is { } state)
                                         await container.GetRequiredService<PlayerService>()
                                             .RestoreFromStateAsync(state);
                                 }