use existing source validator

Author: therama

Code/Sideloaded-TextTracks/Sources/THEOplayerConnectorSideloadedSubtitle/Extensions/URL+Extensions.swift

@@ -31,19 +31,19 @@ extension URL {
 
     var isValid: Bool {
         guard self.scheme != nil else {
-            print("URL scheme is invalid or missing.")
+            print("[AVSubtitlesLoader] URL scheme is invalid or missing.")
             return false
         }
 
         guard let host = self.host,
               !host.isEmpty else {
-            print("URL host is invalid or missing.")
+            print("[AVSubtitlesLoader] URL host is invalid or missing.")
             return false
         }
 
         let disallowedCharacterSet = CharacterSet.urlQueryAllowed.inverted
         guard self.absoluteString.rangeOfCharacter(from: disallowedCharacterSet) == nil else {
-            print("URL contains invalid characters.")
+            print("[AVSubtitlesLoader] URL contains invalid characters.")
             return false
         }
 

Code/Sideloaded-TextTracks/Sources/THEOplayerConnectorSideloadedSubtitle/Parsers/MasterPlaylistParser.swift

@@ -12,7 +12,6 @@ class MasterPlaylistParser: PlaylistParser {
     var constructedManifestArray = [String]()
     fileprivate var lastMediaLine: Int?
     fileprivate let subtitlesGroupId = "THEOsubs"
-    private var extXMediaSubtitlesOriginallyExists = false
 
     override init(url: URL) {
         super.init(url: url)
@@ -21,25 +20,8 @@ class MasterPlaylistParser: PlaylistParser {
     func sideLoadSubtitles(subtitles: [TextTrackDescription], completion: @escaping (_ data: Data?) -> ()) {
         self.loadManifest { succ in
             if succ {
-                let validSubtitles = subtitles.filter { subtitle in
-                    guard subtitle.src.isValid == true else {
-                        print("The provided subtitle source \(subtitle.src.absoluteString) is invalid")
-                        return false
-                    }
-                    return true
-                }
                 self.parseManifest()
-                self.appendSubtitlesLines(subtitles: validSubtitles)
-                if !self.extXMediaSubtitlesOriginallyExists,
-                   validSubtitles.isEmpty {
-                    // when the original m3u8 does not have any subtitles, and there are no valid subtitles to sideload
-                    // then we remove the added subs attribute from the ExtXStreamInf entries
-                    for (i, ele) in self.constructedManifestArray.enumerated() {
-                        let line = HLSLine(lineString: ele)
-                        line.paramsObject.removeValue(forKey: HLSKeywords.subtitles.rawValue)
-                        self.constructedManifestArray[i] = line.joinLine()
-                    }
-                }
+                self.appendSubtitlesLines(subtitles: subtitles)
                 let constructed = self.constructedManifestArray.joined(separator: "\n")
 
                 if THEOplayerConnectorSideloadedSubtitle.SHOW_DEBUG_LOGS {
@@ -77,7 +59,7 @@ class MasterPlaylistParser: PlaylistParser {
                     case HLSKeywords.subtitles.rawValue:
                         line.paramsObject[HLSKeywords.groupId.rawValue] = "\"\(self.subtitlesGroupId)\""
                         self.lastMediaLine = self.constructedManifestArray.count
-                        self.extXMediaSubtitlesOriginallyExists = true
+
                     default:
                         break
                     }

Code/Sideloaded-TextTracks/Sources/THEOplayerConnectorSideloadedSubtitle/Utils/SourceValidator.swift

@@ -15,7 +15,14 @@ class SourceValidator {
             return nil
         }
 
-        let filteredTextTracks = sideLoadedTextTracks.filter { $0.kind == .subtitles }
+        let subtitlesTextTracks = sideLoadedTextTracks.filter { $0.kind == .subtitles }
+        let filteredTextTracks = subtitlesTextTracks.filter { subtitle in
+            guard subtitle.src.isValid == true else {
+                print("[AVSubtitlesLoader] The provided subtitle source \(subtitle.src.absoluteString) is invalid.")
+                return false
+            }
+            return true
+        }
         if filteredTextTracks.isEmpty {
             print("[AVSubtitlesLoader] Unable to find a valid TextTrackDescription for sideloading.")
             return nil