Add AniList tracking for downloaded episodes + Add auto skip filler episodes option (#266)

Author: scigward

Sora/Utlis & Misc/DownloadUtils/DownloadModels.swift

@@ -415,6 +415,8 @@ struct AssetMetadata: Codable {
     let seasonNumber: Int?
     /// Indicates whether this episode is a filler (derived from metadata at download time)
     let isFiller: Bool?
+    let aniListID: Int?
+    let totalEpisodes: Int?
 
     init(
         title: String,
@@ -428,7 +430,9 @@ struct AssetMetadata: Codable {
         showPosterURL: URL? = nil,
         episodeTitle: String? = nil,
         seasonNumber: Int? = nil,
-        isFiller: Bool? = nil
+        isFiller: Bool? = nil,
+        aniListID: Int? = nil,
+        totalEpisodes: Int? = nil
     ) {
         self.title = title
         self.overview = overview
@@ -442,6 +446,8 @@ struct AssetMetadata: Codable {
         self.episodeTitle = episodeTitle
         self.seasonNumber = seasonNumber
         self.isFiller = isFiller
+        self.aniListID = aniListID
+        self.totalEpisodes = totalEpisodes
     }
 }
 

Sora/Utlis & Misc/JSLoader/Downloads/JSController+Downloader.swift

@@ -23,10 +23,11 @@ struct DownloadRequest {
     let aniListID: Int?
     let malID: Int?
     let isFiller: Bool?
+    let totalEpisodes: Int?
 
     init(url: URL, headers: [String: String], title: String? = nil, imageURL: URL? = nil, 
          isEpisode: Bool = false, showTitle: String? = nil, season: Int? = nil, 
-         episode: Int? = nil, subtitleURL: URL? = nil, showPosterURL: URL? = nil, aniListID: Int? = nil, malID: Int? = nil, isFiller: Bool? = nil) {
+         episode: Int? = nil, subtitleURL: URL? = nil, showPosterURL: URL? = nil, aniListID: Int? = nil, malID: Int? = nil, isFiller: Bool? = nil, totalEpisodes: Int? = nil) {
         self.url = url
         self.headers = headers
         self.title = title
@@ -40,6 +41,7 @@ struct DownloadRequest {
         self.aniListID = aniListID
         self.malID = malID
         self.isFiller = isFiller
+        self.totalEpisodes = totalEpisodes
     }
 }
 
@@ -62,14 +64,15 @@ extension JSController {
                                 showTitle: String? = nil, season: Int? = nil, episode: Int? = nil,
                                 subtitleURL: URL? = nil, showPosterURL: URL? = nil,
                                 aniListID: Int? = nil, malID: Int? = nil, isFiller: Bool? = nil,
+                                totalEpisodes: Int? = nil,
                                 completionHandler: ((Bool, String) -> Void)? = nil) {
 
 
         let request = DownloadRequest(
             url: url, headers: headers, title: title, imageURL: imageURL,
             isEpisode: isEpisode, showTitle: showTitle, season: season, 
             episode: episode, subtitleURL: subtitleURL, showPosterURL: showPosterURL,
-            aniListID: aniListID, malID: malID, isFiller: isFiller
+            aniListID: aniListID, malID: malID, isFiller: isFiller, totalEpisodes: totalEpisodes
         )
 
         logDownloadStart(request: request)
@@ -114,7 +117,8 @@ extension JSController {
                         showPosterURL: request.showPosterURL,
                         aniListID: request.aniListID,
                         malID: request.malID,
-                        isFiller: request.isFiller
+                        isFiller: request.isFiller,
+                        totalEpisodes: request.totalEpisodes
                     )
                     self.downloadWithOriginalMethod(request: qualityRequest, completionHandler: completionHandler)
                 } else {
@@ -142,14 +146,15 @@ extension JSController {
                     imageURL: URL? = nil, isEpisode: Bool = false, showTitle: String? = nil,
                     season: Int? = nil, episode: Int? = nil, subtitleURL: URL? = nil,
                     showPosterURL: URL? = nil, aniListID: Int? = nil, malID: Int? = nil, isFiller: Bool? = nil,
+                    totalEpisodes: Int? = nil,
                     completionHandler: ((Bool, String) -> Void)? = nil) {
 
 
         let request = DownloadRequest(
             url: url, headers: headers, title: title, imageURL: imageURL,
             isEpisode: isEpisode, showTitle: showTitle, season: season,
             episode: episode, subtitleURL: subtitleURL, showPosterURL: showPosterURL,
-            aniListID: aniListID, malID: malID, isFiller: isFiller
+            aniListID: aniListID, malID: malID, isFiller: isFiller, totalEpisodes: totalEpisodes
         )
 
         downloadMP4(request: request, completionHandler: completionHandler)
@@ -382,7 +387,9 @@ extension JSController {
             showPosterURL: request.showPosterURL ?? request.imageURL,
             episodeTitle: nil,
             seasonNumber: nil,
-            isFiller: request.isFiller
+            isFiller: request.isFiller,
+            aniListID: request.aniListID,
+            totalEpisodes: request.totalEpisodes
         )
     }
 
@@ -436,6 +443,7 @@ extension JSController {
             aniListID: request.aniListID,
             malID: request.malID,
             isFiller: request.isFiller,
+            totalEpisodes: request.totalEpisodes,
             completionHandler: completionHandler
         )
     }

Sora/Utlis & Misc/JSLoader/Downloads/JSController-Downloads.swift

@@ -117,6 +117,7 @@ extension JSController {
         aniListID: Int? = nil,
         malID: Int? = nil,
         isFiller: Bool? = nil,
+        totalEpisodes: Int? = nil,
         completionHandler: ((Bool, String) -> Void)? = nil
     ) {
         // If a module is provided, use the stream type aware download
@@ -137,6 +138,7 @@ extension JSController {
                 aniListID: aniListID,
                 malID: malID,
                 isFiller: isFiller,
+                totalEpisodes: totalEpisodes,
                 completionHandler: completionHandler
             )
             return
@@ -163,7 +165,9 @@ extension JSController {
             season: season,
             episode: episode,
             showPosterURL: showPosterURL, // Main show poster
-            isFiller: isFiller
+            isFiller: isFiller,
+            aniListID: aniListID,
+            totalEpisodes: totalEpisodes
         )
 
         // Create the download ID now so we can use it for notifications

Sora/Utlis & Misc/JSLoader/Downloads/JSController-StreamTypeDownload.swift

@@ -39,6 +39,7 @@ extension JSController {
         aniListID: Int? = nil,
         malID: Int? = nil,
         isFiller: Bool? = nil,
+        totalEpisodes: Int? = nil,
         completionHandler: ((Bool, String) -> Void)? = nil
     ) {
         let streamType = module.metadata.streamType.lowercased()
@@ -59,6 +60,7 @@ extension JSController {
                 aniListID: aniListID,
                 malID: malID,
                 isFiller: isFiller,
+                totalEpisodes: totalEpisodes,
                 completionHandler: completionHandler
             )
         }else {
@@ -77,6 +79,7 @@ extension JSController {
                 aniListID: aniListID,
                 malID: malID,
                 isFiller: isFiller,
+                totalEpisodes: totalEpisodes,
                 completionHandler: completionHandler
             )
         }

Sora/Views/DownloadView.swift

@@ -281,8 +281,8 @@ struct DownloadView: View {
                 }
             },
             subtitlesURL: asset.localSubtitleURL?.absoluteString,
-            aniListID: 0,
-            totalEpisodes: asset.metadata?.episode ?? 0,
+            aniListID: asset.metadata?.aniListID ?? 0,
+            totalEpisodes: asset.metadata?.totalEpisodes ?? 0,
             episodeImageUrl: asset.metadata?.posterURL?.absoluteString ?? "",
             headers: nil
         )
@@ -1050,7 +1050,6 @@ struct EnhancedShowEpisodesView: View {
 
     var body: some View {
         ZStack {
-            heroImageSection
             mainScrollView
                 .navigationBarHidden(true)
                 .ignoresSafeArea(.container, edges: .top)
@@ -1099,7 +1098,10 @@ struct EnhancedShowEpisodesView: View {
     @ViewBuilder
     private var mainScrollView: some View {
         ScrollView(showsIndicators: false) {
-            contentContainer
+            ZStack(alignment: .top) {
+                heroImageSection
+                contentContainer
+            }
         }
         .onAppear {
             UIScrollView.appearance().bounces = false
@@ -1108,24 +1110,22 @@ struct EnhancedShowEpisodesView: View {
 
     @ViewBuilder
     private var heroImageSection: some View {
-        if let posterURL = group.posterURL {
-            LazyImage(url: posterURL) { state in
-                if let uiImage = state.imageContainer?.image {
-                    Image(uiImage: uiImage)
-                        .resizable()
-                        .aspectRatio(contentMode: .fill)
-                } else {
-                    placeholderGradient
+        Group {
+            if let posterURL = group.posterURL {
+                LazyImage(url: posterURL) { @MainActor state in
+                    if let uiImage = state.imageContainer?.image {
+                        Image(uiImage: uiImage)
+                            .resizable()
+                            .aspectRatio(contentMode: .fill)
+                            .frame(width: UIScreen.main.bounds.width, height: 700)
+                            .clipped()
+                    } else {
+                        placeholderGradient
+                    }
                 }
+            } else {
+                placeholderGradient
             }
-            .ignoresSafeArea(.all)
-            .frame(maxWidth: .infinity, maxHeight: 400)
-            .clipped()
-        } else {
-            placeholderGradient
-                .ignoresSafeArea(.all)
-                .frame(maxWidth: .infinity, maxHeight: 400)
-                .clipped()
         }
     }
 
@@ -1142,6 +1142,8 @@ struct EnhancedShowEpisodesView: View {
                     endPoint: .bottomTrailing
                 )
             )
+            .frame(width: UIScreen.main.bounds.width, height: 700)
+            .clipped()
     }
 
     @ViewBuilder

Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift

@@ -747,7 +747,8 @@ private extension EpisodeCell {
             showPosterURL: showPosterImageURL,
             aniListID: itemID,
             malID: malIDFromParent,
-            isFiller: isFiller
+            isFiller: isFiller,
+            totalEpisodes: totalEpisodes
         ) { success, message in
             if success {
                 Logger.shared.log("Started download for Episode \(self.episodeID + 1): \(self.episode)", type: "Download")

Sora/Views/MediaInfoView/MediaInfoView.swift

@@ -1373,7 +1373,21 @@ struct MediaInfoView: View {
             return
         }
 
-        let nextEpisode = episodeLinks[currentIndex + 1]
+        let autoSkipFillers = UserDefaults.standard.bool(forKey: "autoSkipFillers")
+        var nextIndex = currentIndex + 1
+        
+        if autoSkipFillers, let fillerSet = jikanFillerSet {
+            while nextIndex < episodeLinks.count, fillerSet.contains(episodeLinks[nextIndex].number) {
+                Logger.shared.log("Skipping filler episode \(episodeLinks[nextIndex].number)", type: "Debug")
+                nextIndex += 1
+            }
+            guard nextIndex < episodeLinks.count else {
+                Logger.shared.log("No more non-filler episodes to play", type: "Info")
+                return
+            }
+        }
+        
+        let nextEpisode = episodeLinks[nextIndex]
         selectedEpisodeNumber = nextEpisode.number
         fetchStream(href: nextEpisode.href)
         DropManager.shared.showDrop(

Sora/Views/SettingsView/SettingsSubViews/SettingsViewBackup.swift

@@ -302,6 +302,7 @@ struct SettingsViewBackup: View {
             "skipIntroOutroVisible",
             "pipButtonVisible",
             "autoplayNext",
+            "autoSkipFillers",
             "videoQualityWiFi",
             "videoQualityCellular",
             "subtitlesEnabled",

Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift

@@ -258,6 +258,7 @@ struct SettingsViewPlayer: View {
     @AppStorage("doubleTapSeekEnabled") private var doubleTapSeekEnabled: Bool = false
     @AppStorage("skipIntroOutroVisible") private var skipIntroOutroVisible: Bool = true
     @AppStorage("autoplayNext") private var autoplayNext: Bool = true
+    @AppStorage("autoSkipFillers") private var autoSkipFillers: Bool = false
     @AppStorage("introDBEnabled") private var introDBEnabled: Bool = true
 
     @AppStorage("videoQualityWiFi") private var wifiQuality: String = VideoQualityPreference.defaultWiFiPreference.rawValue
@@ -301,6 +302,13 @@ struct SettingsViewPlayer: View {
                         showDivider: true
                     )
 
+                    SettingsToggleRow(
+                        icon: "forward.fill",
+                        title: NSLocalizedString("Auto Skip Filler Episodes", comment: ""),
+                        isOn: $autoSkipFillers,
+                        showDivider: true
+                    )
+                    
                     SettingsTextFieldRow(
                         icon: "timer",
                         title: NSLocalizedString("Completion Percentage", comment: ""),