Mirrored_Repos/yattee
1
0
Fork 0
mirror of https://github.com/yattee/yattee.git synced 2025-11-20 00:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nil crash when accessing stream.format

Browse Source 
This commit addresses crashes caused by accessing nil format values on streams:

- QualityProfile.swift: Add guard check for stream.format to prevent nil access crash
- MPVBackend.swift: Add nil check in canPlay method before comparing format
- PlayerStreams.swift: Add nil check before comparing format in asset processing

The crashes occurred when stream.format was nil and accessed as an implicitly unwrapped optional, causing "Unexpectedly found nil while implicitly unwrapping an Optional value" errors.
This commit is contained in:
Arkadiusz Fal
2025-11-19 18:03:43 +01:00
parent 4b577a296b
commit 33377f7e0e
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Model/Player/Backends/MPVBackend.swift
View File

@@ -220,7 +220,7 @@ final class MPVBackend: PlayerBackend {
typealias AreInIncreasingOrder = (Stream, Stream) -> Bool
func canPlay(_ stream: Stream) -> Bool {
stream.format != .av1
stream.format != nil && stream.format != .av1
}
func playStream(_ stream: Stream, of video: Video, preservingTime: Bool, upgrading: Bool) {

2
Model/Player/PlayerStreams.swift
View File

@@ -73,7 +73,7 @@ extension PlayerModel {
for stream in streams {
streamProcessingQueue.async(group: streamProcessingGroup) {
let forbiddenAssetTestGroup = DispatchGroup()
if !hasAllowedAsset, !hasForbiddenAsset, !instance.proxiesVideos, stream.format != Stream.Format.unknown {
if !hasAllowedAsset, !hasForbiddenAsset, !instance.proxiesVideos, stream.format != nil && stream.format != Stream.Format.unknown {
let (nonHLSAssets, hlsURLs) = self.getAssets(from: [stream])
if let firstStream = nonHLSAssets.first {
let asset = firstStream.0

7
Model/QualityProfile.swift
View File

@@ -81,6 +81,11 @@ struct QualityProfile: Hashable, Identifiable, Defaults.Serializable {
return false
}
// Safety check: Ensure stream has a format
guard let streamFormat = stream.format else {
return false
}
let defaultResolution = Stream.Resolution.custom(height: 720, refreshRate: 30)
let resolutionMatch = resolution.value ?? defaultResolution >= streamResolution
@@ -88,7 +93,7 @@ struct QualityProfile: Hashable, Identifiable, Defaults.Serializable {
return true
}
let formatMatch = formats.compactMap(\.streamFormat).contains(stream.format)
let formatMatch = formats.compactMap(\.streamFormat).contains(streamFormat)
return resolutionMatch && formatMatch
}