Merge pull request #767 from stonerl/new-defaults

Changes to defaults

Model/Player/Backends/AVPlayerBackend.swift

@@ -122,7 +122,7 @@ final class AVPlayerBackend: PlayerBackend {
     }
 
     func canPlay(_ stream: Stream) -> Bool {
-        stream.kind == .hls || stream.kind == .stream || (stream.kind == .adaptive && stream.format == .mp4)
+        stream.kind == .hls || stream.kind == .stream
     }
 
     func playStream(

Model/Player/PlayerModel.swift

@@ -684,7 +684,7 @@ final class PlayerModel: ObservableObject {
         }
 
         // First, we need to create an array with supported formats.
-        let formatOrderPiP: [QualityProfile.Format] = [.hls, .stream, .mp4]
+        let formatOrderPiP: [QualityProfile.Format] = [.stream, .hls]
 
         guard let video = currentVideo else { return }
         guard let stream = avPlayerBackend.bestPlayable(availableStreams, maxResolution: .hd720p30, formatOrder: formatOrderPiP) else { return }
@@ -1057,7 +1057,7 @@ final class PlayerModel: ObservableObject {
 
     func updateCurrentArtwork() {
         guard let video = currentVideo,
-              let thumbnailURL = video.thumbnailURL(quality: .medium)
+              let thumbnailURL = video.thumbnailURL(quality: Constants.isIPhone ? .medium : .maxres)
         else {
             return
         }

Model/QualityProfile.swift

@@ -6,12 +6,12 @@ struct QualityProfile: Hashable, Identifiable, Defaults.Serializable {
     static var defaultProfile = Self(id: "default", backend: .mpv, resolution: .hd720p60, formats: [.stream], order: Array(Format.allCases.indices))
 
     enum Format: String, CaseIterable, Identifiable, Defaults.Serializable {
-        case hls
-        case stream
         case avc1
+        case stream
+        case webm
         case mp4
         case av1
-        case webm
+        case hls
 
         var id: String {
             rawValue
@@ -30,18 +30,18 @@ struct QualityProfile: Hashable, Identifiable, Defaults.Serializable {
 
         var streamFormat: Stream.Format? {
             switch self {
-            case .hls:
-                return nil
-            case .stream:
-                return nil
             case .avc1:
                 return .avc1
+            case .stream:
+                return nil
+            case .webm:
+                return .webm
             case .mp4:
                 return .mp4
             case .av1:
                 return .av1
-            case .webm:
-                return .webm
+            case .hls:
+                return nil
             }
         }
     }
@@ -59,14 +59,16 @@ struct QualityProfile: Hashable, Identifiable, Defaults.Serializable {
     }
 
     var formatsDescription: String {
-        if formats.count == Format.allCases.count {
+        switch formats.count {
+        case Format.allCases.count:
             return "Any format".localized()
-        }
-        if formats.count <= 3 {
+        case 0:
+            return "No format selected".localized()
+        case 1 ... 3:
             return formats.map(\.description).joined(separator: ", ")
+        default:
+            return String(format: "%@ formats".localized(), String(formats.count))
         }
-
-        return String(format: "%@ formats".localized(), String(formats.count))
     }
 
     func isPreferred(_ stream: Stream) -> Bool {