if no match is found, grab first media source. Fix iOS progress issue.

jellyfin · Aug 17, 2023 · 5442eb3 · 5442eb3
1 parent 75cd55b
commit 5442eb3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/Shared/Extensions/JellyfinAPI/BaseItemDto+VideoPlayerViewModel.swift b/Shared/Extensions/JellyfinAPI/BaseItemDto+VideoPlayerViewModel.swift
@@ -81,6 +81,10 @@ extension BaseItemDto {
                     }
                 }
             }
+            if matchingMediaSource == nil && !responseMediaSources.isEmpty {
+                // Didn't find a match, but maybe we can just grab the first item in the response
+                matchingMediaSource = responseMediaSources.first
+            }
         }
         guard let matchingMediaSource else {
             throw JellyfinAPIError("Matching media source not in playback info")

diff --git a/Swiftfin/Views/VideoPlayer/VideoPlayer.swift b/Swiftfin/Views/VideoPlayer/VideoPlayer.swift
@@ -179,6 +179,9 @@ struct VideoPlayer: View {
                 .environment(\.subtitleOffset, $subtitleOffset)
             }
             .onChange(of: videoPlayerManager.currentProgressHandler.scrubbedProgress) { newValue in
+                guard !newValue.isNaN && !newValue.isInfinite else {
+                    return
+                }
                 DispatchQueue.main.async {
                     videoPlayerManager.currentProgressHandler
                         .scrubbedSeconds = Int(CGFloat(videoPlayerManager.currentViewModel.item.runTimeSeconds) * newValue)