From 3ba52e7df185da93e506bbad8ef9bbf8347add15 Mon Sep 17 00:00:00 2001 From: cranci1 <100066266+cranci1@users.noreply.github.com> Date: Sun, 7 Sep 2025 20:27:50 +0200 Subject: [PATCH] Removed annoying logs + Removed episode timeout --- .../JavaScriptCore+Extensions.swift | 3 --- Sora/Utlis & Misc/Extensions/URLSession.swift | 2 -- .../JSLoader/JSController-Details.swift | 21 +++---------------- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift b/Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift index deae4e9..9fb8f8b 100644 --- a/Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift +++ b/Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift @@ -134,8 +134,6 @@ extension JSContext { var request = URLRequest(url: url) request.httpMethod = httpMethod - Logger.shared.log("FetchV2 Request: URL=\(url), Method=\(httpMethod), Body=\(body ?? "nil"), Encoding=\(encoding ?? "utf-8")", type: "Debug") - func getEncoding(from encodingString: String?) -> String.Encoding { guard let encodingString = encodingString?.lowercased() else { return .utf8 @@ -187,7 +185,6 @@ extension JSContext { } } - Logger.shared.log("Redirect value is \(redirect.boolValue)", type: "Debug") let session = URLSession.fetchData(allowRedirects: redirect.boolValue) let task = session.downloadTask(with: request) { tempFileURL, response, error in diff --git a/Sora/Utlis & Misc/Extensions/URLSession.swift b/Sora/Utlis & Misc/Extensions/URLSession.swift index 72a81b1..987a384 100644 --- a/Sora/Utlis & Misc/Extensions/URLSession.swift +++ b/Sora/Utlis & Misc/Extensions/URLSession.swift @@ -14,8 +14,6 @@ class FetchDelegate: NSObject, URLSessionTaskDelegate { init(allowRedirects: Bool) { self.allowRedirects = allowRedirects } - deinit { Logger.shared.log("FetchDelegate deallocated", type: "Debug") - } func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) { if(allowRedirects) { diff --git a/Sora/Utlis & Misc/JSLoader/JSController-Details.swift b/Sora/Utlis & Misc/JSLoader/JSController-Details.swift index 5278aa4..43d9990 100644 --- a/Sora/Utlis & Misc/JSLoader/JSController-Details.swift +++ b/Sora/Utlis & Misc/JSLoader/JSController-Details.swift @@ -128,6 +128,7 @@ extension JSController { airdate: item["airdate"] as? String ?? "" ) } + Logger.shared.log("Successfully extracted \(resultItems.count) details", type: "Info") } else { Logger.shared.log("Failed to parse JSON of extractDetails", type: "Error") } @@ -161,27 +162,12 @@ extension JSController { promiseDetails.invokeMethod("catch", withArguments: [catchFunctionDetails as Any]) dispatchGroup.enter() - let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString]) - var hasLeftEpisodesGroup = false let episodesGroupQueue = DispatchQueue(label: "episodes.group") - let timeoutWorkItem = DispatchWorkItem { - Logger.shared.log("Timeout for extractEpisodes", type: "Warning") - episodesGroupQueue.sync { - guard !hasLeftEpisodesGroup else { - Logger.shared.log("extractEpisodes: timeout called but group already left", type: "Debug") - return - } - hasLeftEpisodesGroup = true - dispatchGroup.leave() - } - } - DispatchQueue.main.asyncAfter(deadline: .now() + 5.0, execute: timeoutWorkItem) - + let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString]) guard let promiseEpisodes = promiseValueEpisodes else { Logger.shared.log("extractEpisodes did not return a Promise", type: "Error") - timeoutWorkItem.cancel() episodesGroupQueue.sync { guard !hasLeftEpisodesGroup else { return } hasLeftEpisodesGroup = true @@ -192,7 +178,6 @@ extension JSController { } let thenBlockEpisodes: @convention(block) (JSValue) -> Void = { result in - timeoutWorkItem.cancel() episodesGroupQueue.sync { guard !hasLeftEpisodesGroup else { Logger.shared.log("extractEpisodes: thenBlock called but group already left", type: "Debug") @@ -212,6 +197,7 @@ extension JSController { duration: nil ) } + Logger.shared.log("Successfully extracted \(episodeLinks.count) episodes", type: "Info") } else { Logger.shared.log("Failed to parse JSON of extractEpisodes", type: "Error") } @@ -226,7 +212,6 @@ extension JSController { } let catchBlockEpisodes: @convention(block) (JSValue) -> Void = { error in - timeoutWorkItem.cancel() episodesGroupQueue.sync { guard !hasLeftEpisodesGroup else { Logger.shared.log("extractEpisodes: catchBlock called but group already left", type: "Debug")