From 324c1f94c5502894f880cd662ee1c33d981ca06b Mon Sep 17 00:00:00 2001
From: scigward <malekalmutairi305@gmail.com>
Date: Wed, 20 Aug 2025 00:28:45 +0300
Subject: [PATCH] please x2

---
 .../CustomPlayer/CustomPlayer.swift           | 57 ++++++++++---------
 .../EpisodeCell/EpisodeCell.swift             |  4 ++
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/Sora/MediaUtils/CustomPlayer/CustomPlayer.swift b/Sora/MediaUtils/CustomPlayer/CustomPlayer.swift
index 0f6d058..14edb42 100644
--- a/Sora/MediaUtils/CustomPlayer/CustomPlayer.swift
+++ b/Sora/MediaUtils/CustomPlayer/CustomPlayer.swift
@@ -3871,42 +3871,45 @@ class GradientBlurButton: UIButton {
 
 
     /// Load OP/ED skip data from a simple sidecar JSON saved next to the local video (if present)
-    extension CustomMediaPlayerViewController {
 extension CustomMediaPlayerViewController {
-    private func loadLocalSkipSidecar(for fileURL: URL) {
-        let fm = FileManager.default
-        var dir = fileURL.deletingLastPathComponent()
-        var base = fileURL.deletingPathExtension().lastPathComponent
-        var isDir: ObjCBool = false
-        if fm.fileExists(atPath: fileURL.path, isDirectory: &isDir), isDir.boolValue {
-            // HLS package directory: look in parent dir, use directory name
-            dir = fileURL.deletingLastPathComponent()
-            base = fileURL.lastPathComponent
+
+    private struct SkipSidecar: Decodable {
+        struct Interval: Decodable {
+            let start_time: Double
+            let end_time: Double
         }
-        let sidecar = dir.appendingPathComponent(base + ".skip.json")
+        struct Result: Decodable {
+            let interval: Interval
+            let skip_type: String
+        }
+        let results: [Result]
+    }
+
+    func loadLocalSkipSidecar(for fileURL: URL) {
+        let sidecarURL = fileURL.deletingPathExtension().appendingPathExtension("skip.json")
         do {
-            let data = try Data(contentsOf: sidecar)
-            if let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
-                if let op = (json["op"] as? [String: Any]), let s = op["start"] as? Double, let e = op["end"] as? Double {
-                    let range = CMTimeRange(start: CMTime(seconds: s, preferredTimescale: 600), end: CMTime(seconds: e, preferredTimescale: 600))
+            let data = try Data(contentsOf: sidecarURL)
+            let model = try JSONDecoder().decode(SkipSidecar.self, from: data)
+            for r in model.results {
+                let range = CMTimeRange(
+                    start: CMTime(seconds: r.interval.start_time, preferredTimescale: 600),
+                    end:   CMTime(seconds: r.interval.end_time,   preferredTimescale: 600)
+                )
+                switch r.skip_type.lowercased() {
+                case "op":
                     self.skipIntervals.op = range
-                    print("[Player] Loaded local OP: \(s)-\(e)")
-                }
-                if let ed = (json["ed"] as? [String: Any]), let s = ed["start"] as? Double, let e = ed["end"] as? Double {
-                    let range = CMTimeRange(start: CMTime(seconds: s, preferredTimescale: 600), end: CMTime(seconds: e, preferredTimescale: 600))
+                case "ed":
                     self.skipIntervals.ed = range
-                    print("[Player] Loaded local ED: \(s)-\(e)")
-                }
-                DispatchQueue.main.async {
-                    self.updateSkipButtonsVisibility()
+                default:
+                    break
                 }
             }
+            if self.duration > 0 {
+                self.updateSegments()
+                self.updateSkipButtonsVisibility()
+            }
         } catch {
             print("[Player] No local skip sidecar found or failed to load: \(error.localizedDescription)")
         }
     }
 }
-
-}
-
-    
\ No newline at end of file
diff --git a/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift b/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift
index 86f673b..9a61e2d 100644
--- a/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift
+++ b/Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift
@@ -83,6 +83,10 @@ struct EpisodeCell: View {
         seasonNumber: Int? = nil,
         fillerEpisodes: Set<Int>? = nil
     ) {
+    init(module: ScrapingModule, episodeIndex: Int, episodeID: Int, progress: Double, isBookmarked: Bool, state: EpisodeState, metadata: MediaInfoView.MediaMetadata, anilistID: Int? = nil, malID: Int? = nil, fillerEpisodes: Set<Int> = [], malIDFromParent: Int? = nil) {
+        self.init(module: module, episodeIndex: episodeIndex, episodeID: episodeID, malID: malID ?? malIDFromParent, progress: progress, isBookmarked: isBookmarked, state: state, metadata: metadata, anilistID: anilistID, fillerEpisodes: fillerEpisodes, malIDFromParent: malIDFromParent)
+    }
+    
         self.episodeIndex = episodeIndex
         self.episode = episode
         self.episodeID = episodeID