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

Merge branch 'main' of https://github.com/Seeike/Sora

Browse source
This commit is contained in:
Seiike 2025-01-23 00:47:31 +01:00
commit 9a8ea5f94d
2 changed files with 78 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

178
Sora/Utils/Loaders/JSController.swift
View file

@ -17,52 +17,45 @@ class JSController: ObservableObject {
private func setupContext() { private func setupContext() {
let logFunction: @convention(block) (String) -> Void = { message in let logFunction: @convention(block) (String) -> Void = { message in
Logger.shared.log("JavaScript log: \(message)", type: "Debug") Logger.shared.log("JavaScript log: \(message)")
} }
context.setObject(logFunction, forKeyedSubscript: "log" as NSString) context.setObject(logFunction, forKeyedSubscript: "log" as NSString)
// Override console.log
let consoleLogOverride = """
var console = {
log: function() {
var message = Array.from(arguments).map(String).join(" ");
log(message);
}
};
"""
context.evaluateScript(consoleLogOverride)
// Add other JavaScript functions like fetchNative
let fetchNativeFunction: @convention(block) (String, JSValue, JSValue) -> Void = { urlString, resolve, reject in let fetchNativeFunction: @convention(block) (String, JSValue, JSValue) -> Void = { urlString, resolve, reject in
guard let url = URL(string: urlString) else { guard let url = URL(string: urlString) else {
Logger.shared.log("Invalid URL", type: "Error") Logger.shared.log("Invalid URL")
reject.call(withArguments: ["Invalid URL"]) reject.call(withArguments: ["Invalid URL"])
return return
} }
let task = URLSession.shared.dataTask(with: url) { data, _, error in let task = URLSession.custom.dataTask(with: url) { data, _, error in
if let error = error { if let error = error {
Logger.shared.log("Network error in fetchNative: \(error.localizedDescription)", type: "Error") Logger.shared.log("Network error in fetchNativeFunction: \(error.localizedDescription)")
reject.call(withArguments: [error.localizedDescription]) reject.call(withArguments: [error.localizedDescription])
return return
} }
guard let data = data, let text = String(data: data, encoding: .utf8) else { guard let data = data else {
Logger.shared.log("Failed to decode response data", type: "Error") Logger.shared.log("No data in response")
reject.call(withArguments: ["Failed to decode response data"]) reject.call(withArguments: ["No data"])
return return
} }
resolve.call(withArguments: [text]) if let text = String(data: data, encoding: .utf8) {
resolve.call(withArguments: [text])
} else {
Logger.shared.log("Unable to decode data to text")
reject.call(withArguments: ["Unable to decode data"])
}
} }
task.resume() task.resume()
} }
context.setObject(fetchNativeFunction, forKeyedSubscript: "fetchNative" as NSString) context.setObject(fetchNativeFunction, forKeyedSubscript: "fetchNative" as NSString)
let fetchDefinition = """ let fetchDefinition = """
function fetch(url) { function fetch(url) {
return new Promise(function(resolve, reject) { return new Promise(function(resolve, reject) {
fetchNative(url, resolve, reject); fetchNative(url, resolve, reject);
}); });
} }
""" """
context.evaluateScript(fetchDefinition) context.evaluateScript(fetchDefinition)
} }
@ -84,18 +77,18 @@ class JSController: ObservableObject {
guard let self = self else { return } guard let self = self else { return }
if let error = error { if let error = error {
Logger.shared.log("Network error: \(error)", type: "Error") Logger.shared.log("Network error: \(error)")
DispatchQueue.main.async { completion([]) } DispatchQueue.main.async { completion([]) }
return return
} }
guard let data = data, let html = String(data: data, encoding: .utf8) else { guard let data = data, let html = String(data: data, encoding: .utf8) else {
Logger.shared.log("Failed to decode HTML", type: "Error") Logger.shared.log("Failed to decode HTML")
DispatchQueue.main.async { completion([]) } DispatchQueue.main.async { completion([]) }
return return
} }
Logger.shared.log(html, type: "Debug") Logger.shared.log(html)
if let parseFunction = self.context.objectForKeyedSubscript("searchResults"), if let parseFunction = self.context.objectForKeyedSubscript("searchResults"),
let results = parseFunction.call(withArguments: [html]).toArray() as? [[String: String]] { let results = parseFunction.call(withArguments: [html]).toArray() as? [[String: String]] {
let resultItems = results.map { item in let resultItems = results.map { item in
@ -109,7 +102,7 @@ class JSController: ObservableObject {
completion(resultItems) completion(resultItems)
} }
} else { } else {
Logger.shared.log("Failed to parse results", type: "Error") Logger.shared.log("Failed to parse results")
DispatchQueue.main.async { completion([]) } DispatchQueue.main.async { completion([]) }
} }
}.resume() }.resume()
@ -125,13 +118,13 @@ class JSController: ObservableObject {
guard let self = self else { return } guard let self = self else { return }
if let error = error { if let error = error {
Logger.shared.log("Network error: \(error)", type: "Error") Logger.shared.log("Network error: \(error)")
DispatchQueue.main.async { completion([], []) } DispatchQueue.main.async { completion([], []) }
return return
} }
guard let data = data, let html = String(data: data, encoding: .utf8) else { guard let data = data, let html = String(data: data, encoding: .utf8) else {
Logger.shared.log("Failed to decode HTML", type: "Error") Logger.shared.log("Failed to decode HTML")
DispatchQueue.main.async { completion([], []) } DispatchQueue.main.async { completion([], []) }
return return
} }
@ -139,7 +132,7 @@ class JSController: ObservableObject {
var resultItems: [MediaItem] = [] var resultItems: [MediaItem] = []
var episodeLinks: [EpisodeLink] = [] var episodeLinks: [EpisodeLink] = []
Logger.shared.log(html, type: "Debug") Logger.shared.log(html)
if let parseFunction = self.context.objectForKeyedSubscript("extractDetails"), if let parseFunction = self.context.objectForKeyedSubscript("extractDetails"),
let results = parseFunction.call(withArguments: [html]).toArray() as? [[String: String]] { let results = parseFunction.call(withArguments: [html]).toArray() as? [[String: String]] {
resultItems = results.map { item in resultItems = results.map { item in
@ -150,7 +143,7 @@ class JSController: ObservableObject {
) )
} }
} else { } else {
Logger.shared.log("Failed to parse results", type: "Error") Logger.shared.log("Failed to parse results")
} }
if let fetchEpisodesFunction = self.context.objectForKeyedSubscript("extractEpisodes"), if let fetchEpisodesFunction = self.context.objectForKeyedSubscript("extractEpisodes"),
@ -178,26 +171,25 @@ class JSController: ObservableObject {
guard let self = self else { return } guard let self = self else { return }
if let error = error { if let error = error {
Logger.shared.log("Network error: \(error)", type: "Error") Logger.shared.log("Network error: \(error)")
DispatchQueue.main.async { completion(nil) } DispatchQueue.main.async { completion(nil) }
return return
} }
guard let data = data, let html = String(data: data, encoding: .utf8) else { guard let data = data, let html = String(data: data, encoding: .utf8) else {
Logger.shared.log("Failed to decode HTML", type: "Error") Logger.shared.log("Failed to decode HTML")
DispatchQueue.main.async { completion(nil) } DispatchQueue.main.async { completion(nil) }
return return
} }
Logger.shared.log(html, type: "Debug") Logger.shared.log(html)
if let parseFunction = self.context.objectForKeyedSubscript("extractStreamUrl"), if let parseFunction = self.context.objectForKeyedSubscript("extractStreamUrl"),
let streamUrl = parseFunction.call(withArguments: [html]).toString() { let streamUrl = parseFunction.call(withArguments: [html]).toString() {
Logger.shared.log("Staring stream from: \(streamUrl)", type: "Stream")
DispatchQueue.main.async { DispatchQueue.main.async {
completion(streamUrl) completion(streamUrl)
} }
} else { } else {
Logger.shared.log("Failed to extract stream URL", type: "Error") Logger.shared.log("Failed to extract stream URL")
DispatchQueue.main.async { completion(nil) } DispatchQueue.main.async { completion(nil) }
} }
}.resume() }.resume()
@ -205,27 +197,27 @@ class JSController: ObservableObject {
func fetchJsSearchResults(keyword: String, module: ScrapingModule, completion: @escaping ([SearchItem]) -> Void) { func fetchJsSearchResults(keyword: String, module: ScrapingModule, completion: @escaping ([SearchItem]) -> Void) {
if let exception = context.exception { if let exception = context.exception {
Logger.shared.log("JavaScript exception: \(exception)", type: "Error") Logger.shared.log("JavaScript exception: \(exception)")
completion([]) completion([])
return return
} }
guard let searchResultsFunction = context.objectForKeyedSubscript("searchResults") else { guard let searchResultsFunction = context.objectForKeyedSubscript("searchResults") else {
Logger.shared.log("No JavaScript function searchResults found", type: "Error") Logger.shared.log("No JavaScript function searchResults found")
completion([]) completion([])
return return
} }
let promiseValue = searchResultsFunction.call(withArguments: [keyword]) let promiseValue = searchResultsFunction.call(withArguments: [keyword])
guard let promise = promiseValue else { guard let promise = promiseValue else {
Logger.shared.log("searchResults did not return a Promise", type: "Error") Logger.shared.log("searchResults did not return a Promise")
completion([]) completion([])
return return
} }
let thenBlock: @convention(block) (JSValue) -> Void = { result in let thenBlock: @convention(block) (JSValue) -> Void = { result in
Logger.shared.log(result.toString(), type: "Debug") Logger.shared.log(result.toString())
if let jsonString = result.toString(), if let jsonString = result.toString(),
let data = jsonString.data(using: .utf8) { let data = jsonString.data(using: .utf8) {
do { do {
@ -242,13 +234,13 @@ class JSController: ObservableObject {
} }
} else { } else {
Logger.shared.log("Failed to parse JSON", type: "Error") Logger.shared.log("Failed to parse JSON")
DispatchQueue.main.async { DispatchQueue.main.async {
completion([]) completion([])
} }
} }
} catch { } catch {
Logger.shared.log("JSON parsing error: \(error)", type: "Error") Logger.shared.log("JSON parsing error: \(error)")
DispatchQueue.main.async { DispatchQueue.main.async {
completion([]) completion([])
} }
@ -262,7 +254,7 @@ class JSController: ObservableObject {
} }
let catchBlock: @convention(block) (JSValue) -> Void = { error in let catchBlock: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected: \(String(describing: error.toString()))", type: "Error") Logger.shared.log("Promise rejected: \(String(describing: error.toString()))")
DispatchQueue.main.async { DispatchQueue.main.async {
completion([]) completion([])
} }
@ -282,19 +274,19 @@ class JSController: ObservableObject {
} }
if let exception = context.exception { if let exception = context.exception {
Logger.shared.log("JavaScript exception: \(exception)", type: "Error") Logger.shared.log("JavaScript exception: \(exception)")
completion([], []) completion([], [])
return return
} }
guard let extractDetailsFunction = context.objectForKeyedSubscript("extractDetails") else { guard let extractDetailsFunction = context.objectForKeyedSubscript("extractDetails") else {
Logger.shared.log("No JavaScript function extractDetails found", type: "Error") Logger.shared.log("No JavaScript function extractDetails found")
completion([], []) completion([], [])
return return
} }
guard let extractEpisodesFunction = context.objectForKeyedSubscript("extractEpisodes") else { guard let extractEpisodesFunction = context.objectForKeyedSubscript("extractEpisodes") else {
Logger.shared.log("No JavaScript function extractEpisodes found", type: "Error") Logger.shared.log("No JavaScript function extractEpisodes found")
completion([], []) completion([], [])
return return
} }
@ -302,51 +294,44 @@ class JSController: ObservableObject {
var resultItems: [MediaItem] = [] var resultItems: [MediaItem] = []
var episodeLinks: [EpisodeLink] = [] var episodeLinks: [EpisodeLink] = []
let dispatchGroup = DispatchGroup()
dispatchGroup.enter()
let promiseValueDetails = extractDetailsFunction.call(withArguments: [url.absoluteString]) let promiseValueDetails = extractDetailsFunction.call(withArguments: [url.absoluteString])
guard let promiseDetails = promiseValueDetails else { guard let promiseDetails = promiseValueDetails else {
Logger.shared.log("extractDetails did not return a Promise", type: "Error") Logger.shared.log("extractDetails did not return a Promise")
completion([], []) completion([], [])
return return
} }
let thenBlockDetails: @convention(block) (JSValue) -> Void = { result in let thenBlockDetails: @convention(block) (JSValue) -> Void = { result in
Logger.shared.log(result.toString())
Logger.shared.log(result.toString(), type: "Debug")
if let jsonOfDetails = result.toString(), if let jsonOfDetails = result.toString(),
let dataDetails = jsonOfDetails.data(using: .utf8) { let dataDetails = jsonOfDetails.data(using: .utf8) {
do { do {
if let array = try JSONSerialization.jsonObject(with: dataDetails, options: []) as? [[String: Any]] { if let array = try JSONSerialization.jsonObject(with: dataDetails, options: []) as? [[String: Any]] {
resultItems = array.map { item -> MediaItem in resultItems = array.map { item -> MediaItem in
let description = item["description"] as? String ?? "" MediaItem(
let aliases = item["aliases"] as? String ?? "" description: item["description"] as? String ?? "",
let airdate = item["airdate"] as? String ?? "" aliases: item["aliases"] as? String ?? "",
return MediaItem(description: description, aliases: aliases, airdate: airdate) airdate: item["airdate"] as? String ?? ""
)
} }
} else { } else {
Logger.shared.log("Failed to parse JSON of extractDetails", type: "Error") Logger.shared.log("Failed to parse JSON of extractDetails")
DispatchQueue.main.async {
completion([], [])
}
} }
} catch { } catch {
Logger.shared.log("JSON parsing error of extract details: \(error)", type: "Error") Logger.shared.log("JSON parsing error of extract details: \(error)")
DispatchQueue.main.async {
completion([], [])
}
} }
} else { } else {
Logger.shared.log("Result is not a string of extractDetails", type: "Error") Logger.shared.log("Result is not a string of extractDetails")
DispatchQueue.main.async {
completion([], [])
}
} }
dispatchGroup.leave()
} }
let catchBlockDetails: @convention(block) (JSValue) -> Void = { error in let catchBlockDetails: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected of extractDetails: \(String(describing: error.toString()))", type: "Error") Logger.shared.log("Promise rejected of extractDetails: \(String(describing: error.toString()))")
DispatchQueue.main.async { dispatchGroup.leave()
completion([], [])
}
} }
let thenFunctionDetails = JSValue(object: thenBlockDetails, in: context) let thenFunctionDetails = JSValue(object: thenBlockDetails, in: context)
@ -355,56 +340,41 @@ class JSController: ObservableObject {
promiseDetails.invokeMethod("then", withArguments: [thenFunctionDetails as Any]) promiseDetails.invokeMethod("then", withArguments: [thenFunctionDetails as Any])
promiseDetails.invokeMethod("catch", withArguments: [catchFunctionDetails as Any]) promiseDetails.invokeMethod("catch", withArguments: [catchFunctionDetails as Any])
dispatchGroup.enter()
let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString]) let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString])
guard let promiseEpisodes = promiseValueEpisodes else { guard let promiseEpisodes = promiseValueEpisodes else {
Logger.shared.log("extractEpisodes did not return a Promise", type: "Error") Logger.shared.log("extractEpisodes did not return a Promise")
completion([], []) completion([], [])
return return
} }
let thenBlockEpisodes: @convention(block) (JSValue) -> Void = { result in let thenBlockEpisodes: @convention(block) (JSValue) -> Void = { result in
Logger.shared.log(result.toString())
Logger.shared.log(result.toString(), type: "Debug")
if let jsonOfEpisodes = result.toString(), if let jsonOfEpisodes = result.toString(),
let dataEpisodes = jsonOfEpisodes.data(using: .utf8) { let dataEpisodes = jsonOfEpisodes.data(using: .utf8) {
do { do {
if let array = try JSONSerialization.jsonObject(with: dataEpisodes, options: []) as? [[String: Any]] { if let array = try JSONSerialization.jsonObject(with: dataEpisodes, options: []) as? [[String: Any]] {
episodeLinks = array.map { item -> EpisodeLink in episodeLinks = array.map { item -> EpisodeLink in
let number = item["number"] as? Int ?? 0 EpisodeLink(
let href = item["href"] as? String ?? "" number: item["number"] as? Int ?? 0,
return EpisodeLink(number: number, href: href) href: item["href"] as? String ?? ""
)
} }
DispatchQueue.main.async {
completion(resultItems, episodeLinks)
}
} else { } else {
Logger.shared.log("Failed to parse JSON of extractEpisodes", type: "Error") Logger.shared.log("Failed to parse JSON of extractEpisodes")
DispatchQueue.main.async {
completion([], [])
}
} }
} catch { } catch {
Logger.shared.log("JSON parsing error of extractEpisodes: \(error)", type: "Error") Logger.shared.log("JSON parsing error of extractEpisodes: \(error)")
DispatchQueue.main.async {
completion([], [])
}
} }
} else { } else {
Logger.shared.log("Result is not a string of extractEpisodes", type: "Error") Logger.shared.log("Result is not a string of extractEpisodes")
DispatchQueue.main.async {
completion([], [])
}
} }
dispatchGroup.leave()
} }
let catchBlockEpisodes: @convention(block) (JSValue) -> Void = { error in let catchBlockEpisodes: @convention(block) (JSValue) -> Void = { error in
Logger.shared.log("Promise rejected of extractEpisodes: \(String(describing: error.toString()))", type: "Error") Logger.shared.log("Promise rejected of extractEpisodes: \(String(describing: error.toString()))")
DispatchQueue.main.async { dispatchGroup.leave()
completion([], [])
}
} }
let thenFunctionEpisodes = JSValue(object: thenBlockEpisodes, in: context) let thenFunctionEpisodes = JSValue(object: thenBlockEpisodes, in: context)
@ -412,5 +382,9 @@ class JSController: ObservableObject {
promiseEpisodes.invokeMethod("then", withArguments: [thenFunctionEpisodes as Any]) promiseEpisodes.invokeMethod("then", withArguments: [thenFunctionEpisodes as Any])
promiseEpisodes.invokeMethod("catch", withArguments: [catchFunctionEpisodes as Any]) promiseEpisodes.invokeMethod("catch", withArguments: [catchFunctionEpisodes as Any])
dispatchGroup.notify(queue: .main) {
completion(resultItems, episodeLinks)
}
} }
} }

4
Sora/Views/MediaInfoView/MediaInfoView.swift
View file

@ -56,7 +56,7 @@ struct MediaInfoView: View {
.font(.system(size: 17)) .font(.system(size: 17))
.fontWeight(.bold) .fontWeight(.bold)
if !aliases.isEmpty && aliases != title && aliases != "N/A" { if !aliases.isEmpty && aliases != title && aliases != "N/A" && aliases != "No Data" {
Text(aliases) Text(aliases)
.font(.system(size: 13)) .font(.system(size: 13))
.foregroundColor(.secondary) .foregroundColor(.secondary)
@ -64,7 +64,7 @@ struct MediaInfoView: View {
Spacer() Spacer()
if !airdate.isEmpty && airdate != "N/A" { if !airdate.isEmpty && airdate != "N/A" && airdate != "No Data" {
HStack(alignment: .center, spacing: 12) { HStack(alignment: .center, spacing: 12) {
HStack(spacing: 4) { HStack(spacing: 4) {
Image(systemName: "calendar") Image(systemName: "calendar")