Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-04-21 08:32:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated the subfetching stuff

Browse source
This commit is contained in:
cranci1 2025-11-14 17:22:42 +01:00
parent 8d6d2acc7e
commit 2bb4234712
1 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Sora/MediaUtils/CustomPlayer/Helpers/VTTSubtitlesLoader.swift
View file

@ -13,7 +13,7 @@ struct SubtitleCue: Identifiable {
let endTime: Double let endTime: Double
let text: String let text: String
let lines: [String] let lines: [String]
init(startTime: Double, endTime: Double, text: String) { init(startTime: Double, endTime: Double, text: String) {
self.startTime = startTime self.startTime = startTime
self.endTime = endTime self.endTime = endTime
@ -46,7 +46,8 @@ class VTTSubtitlesLoader: ObservableObject {
return return
} }
let detectedFormat = self.determineSubtitleFormat(from: url) let trimmed = subtitleContent.trimmingCharacters(in: .whitespacesAndNewlines)
let detectedFormat: SubtitleFormat = trimmed.contains("WEBVTT") ? .vtt : .srt
DispatchQueue.main.async { DispatchQueue.main.async {
switch detectedFormat { switch detectedFormat {
@ -55,7 +56,7 @@ class VTTSubtitlesLoader: ObservableObject {
case .srt: case .srt:
self.cues = self.parseSRT(content: subtitleContent) self.cues = self.parseSRT(content: subtitleContent)
case .unknown: case .unknown:
if subtitleContent.trimmingCharacters(in: .whitespacesAndNewlines).hasPrefix("WEBVTT") { if trimmed.contains("WEBVTT") {
self.cues = self.parseVTT(content: subtitleContent) self.cues = self.parseVTT(content: subtitleContent)
} else { } else {
self.cues = self.parseSRT(content: subtitleContent) self.cues = self.parseSRT(content: subtitleContent)
@ -65,18 +66,6 @@ class VTTSubtitlesLoader: ObservableObject {
}.resume() }.resume()
} }
private func determineSubtitleFormat(from url: URL) -> SubtitleFormat {
let fileExtension = url.pathExtension.lowercased()
switch fileExtension {
case "vtt", "webvtt":
return .vtt
case "srt":
return .srt
default:
return .unknown
}
}
private func parseVTT(content: String) -> [SubtitleCue] { private func parseVTT(content: String) -> [SubtitleCue] {
let contentLines = content.components(separatedBy: .newlines) let contentLines = content.components(separatedBy: .newlines)
var subtitleCues: [SubtitleCue] = [] var subtitleCues: [SubtitleCue] = []