fix #568

kingslay · Oct 4, 2023 · 8701fe7 · 8701fe7
1 parent 858ed51
commit 8701fe7
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 38 deletions.
diff --git a/Demo/SwiftUI/Shared/MovieModel.swift b/Demo/SwiftUI/Shared/MovieModel.swift
@@ -243,17 +243,6 @@ extension MovieModel {
         }
     }
 
-    func save() {
-        guard let context = managedObjectContext else {
-            return
-        }
-        context.perform {
-            do {
-                try context.save()
-            } catch {}
-        }
-    }
-
     func getPlaymodel() -> PlayModel {
         if let playmodel {
             return playmodel
@@ -266,19 +255,13 @@ extension MovieModel {
         newMovieModel.setValuesForKeys(dictionaryWithValues(forKeys: entity.attributesByName.keys.map { $0 }))
         newMovieModel.playmodel = model
         context.assign(newMovieModel, to: privateStore)
-        try? context.save()
+        newMovieModel.save()
         context.delete(self)
         return model
     }
 }
 
-extension NSManagedObject {}
-
-extension PlayModel {
-    convenience init() {
-        self.init(context: PersistenceController.shared.viewContext)
-    }
-
+extension NSManagedObject {
     func save() {
         guard let context = managedObjectContext else {
             return
@@ -291,6 +274,12 @@ extension PlayModel {
     }
 }
 
+extension PlayModel {
+    convenience init() {
+        self.init(context: PersistenceController.shared.viewContext)
+    }
+}
+
 extension KSVideoPlayerView {
     init(url: URL) {
         let request = NSFetchRequest<MovieModel>(entityName: "MovieModel")

diff --git a/Sources/KSPlayer/Subtitle/KSSubtitle.swift b/Sources/KSPlayer/Subtitle/KSSubtitle.swift
@@ -239,23 +239,23 @@ open class SubtitleModel: ObservableObject {
             switch self {
             case .smaller:
                 #if os(tvOS)
-                return 30
+                return 48
                 #elseif os(macOS)
                 return 20
                 #else
                 return 12
                 #endif
             case .standard:
                 #if os(tvOS)
-                return 36
+                return 58
                 #elseif os(macOS)
                 return 26
                 #else
                 return 16
                 #endif
             case .large:
                 #if os(tvOS)
-                return 42
+                return 68
                 #elseif os(macOS)
                 return 32
                 #else

diff --git a/Sources/KSPlayer/Subtitle/SubtitleDataSouce.swift b/Sources/KSPlayer/Subtitle/SubtitleDataSouce.swift
@@ -168,19 +168,18 @@ public class ShooterSubtitleDataSouce: SearchSubtitleDataSouce {
         guard let json = try JSONSerialization.jsonObject(with: data) as? [[String: Any]] else {
             return
         }
-        json.forEach { sub in
+        infos = json.flatMap { sub in
             let filesDic = sub["Files"] as? [[String: String]]
 //                let desc = sub["Desc"] as? String ?? ""
             let delay = TimeInterval(sub["Delay"] as? Int ?? 0) / 1000.0
-            let result = filesDic?.compactMap { dic in
+            return filesDic?.compactMap { dic in
                 if let string = dic["Link"], let url = URL(string: string) {
                     let info = URLSubtitleInfo(subtitleID: string, name: "", url: url)
                     info.delay = delay
                     return info
                 }
                 return nil
             } ?? [URLSubtitleInfo]()
-            self.infos.append(contentsOf: result)
         }
     }
 }
@@ -214,11 +213,13 @@ public class AssrtSubtitleDataSouce: SearchSubtitleDataSouce {
         guard let subDict = json["sub"] as? [String: Any], let subArray = subDict["subs"] as? [[String: Any]] else {
             return
         }
+        var result = [URLSubtitleInfo]()
         for sub in subArray {
             if let assrtSubID = sub["id"] as? Int {
-                try await infos.append(contentsOf: loadDetails(assrtSubID: String(assrtSubID)))
+                try await result.append(contentsOf: loadDetails(assrtSubID: String(assrtSubID)))
             }
         }
+        infos = result
     }
 
     func loadDetails(assrtSubID: String) async throws -> [URLSubtitleInfo] {

diff --git a/Sources/KSPlayer/SwiftUI/KSVideoPlayerView.swift b/Sources/KSPlayer/SwiftUI/KSVideoPlayerView.swift
@@ -191,19 +191,19 @@ public struct KSVideoPlayerView: View {
         //            return .handled
         //        }
         #if os(macOS)
-        .onTapGesture(count: 2) {
-            guard let view = playerCoordinator.playerLayer else {
-                return
+            .onTapGesture(count: 2) {
+                guard let view = playerCoordinator.playerLayer else {
+                    return
+                }
+                view.window?.toggleFullScreen(nil)
+                view.needsLayout = true
+                view.layoutSubtreeIfNeeded()
+            }
+            .onExitCommand {
+                playerCoordinator.playerLayer?.exitFullScreenMode()
             }
-            view.window?.toggleFullScreen(nil)
-            view.needsLayout = true
-            view.layoutSubtreeIfNeeded()
-        }
-        .onExitCommand {
-            playerCoordinator.playerLayer?.exitFullScreenMode()
-        }
         #else
-        .onTapGesture {
+            .onTapGesture {
                 isMaskShow.toggle()
             }
         #endif

diff --git a/Sources/KSPlayer/Video/VideoPlayerView.swift b/Sources/KSPlayer/Video/VideoPlayerView.swift
@@ -240,7 +240,12 @@ open class VideoPlayerView: PlayerView {
         if srtControl.subtitle(currentTime: currentTime) {
             if let part = srtControl.parts.first {
                 subtitleBackView.image = part.image
-                subtitleLabel.attributedText = part.text
+                if let text = part.text {
+                    let attributedText = NSMutableAttributedString(attributedString: text)
+                    attributedText.addAttributes([.font: SubtitleModel.textFont],
+                                                 range: NSRange(location: 0, length: text.length))
+                    subtitleLabel.attributedText = attributedText
+                }
                 subtitleBackView.isHidden = false
             } else {
                 subtitleBackView.image = nil