Skip to content

Commit 3ba52e7

Browse files
committed
Removed annoying logs + Removed episode timeout
1 parent 7b08274 commit 3ba52e7

3 files changed

Lines changed: 3 additions & 23 deletions

File tree

Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ extension JSContext {
134134
var request = URLRequest(url: url)
135135
request.httpMethod = httpMethod
136136

137-
Logger.shared.log("FetchV2 Request: URL=\(url), Method=\(httpMethod), Body=\(body ?? "nil"), Encoding=\(encoding ?? "utf-8")", type: "Debug")
138-
139137
func getEncoding(from encodingString: String?) -> String.Encoding {
140138
guard let encodingString = encodingString?.lowercased() else {
141139
return .utf8
@@ -187,7 +185,6 @@ extension JSContext {
187185
}
188186
}
189187

190-
Logger.shared.log("Redirect value is \(redirect.boolValue)", type: "Debug")
191188
let session = URLSession.fetchData(allowRedirects: redirect.boolValue)
192189

193190
let task = session.downloadTask(with: request) { tempFileURL, response, error in

Sora/Utlis & Misc/Extensions/URLSession.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ class FetchDelegate: NSObject, URLSessionTaskDelegate {
1414
init(allowRedirects: Bool) {
1515
self.allowRedirects = allowRedirects
1616
}
17-
deinit { Logger.shared.log("FetchDelegate deallocated", type: "Debug")
18-
}
1917

2018
func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
2119
if(allowRedirects) {

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ extension JSController {
128128
airdate: item["airdate"] as? String ?? ""
129129
)
130130
}
131+
Logger.shared.log("Successfully extracted \(resultItems.count) details", type: "Info")
131132
} else {
132133
Logger.shared.log("Failed to parse JSON of extractDetails", type: "Error")
133134
}
@@ -161,27 +162,12 @@ extension JSController {
161162
promiseDetails.invokeMethod("catch", withArguments: [catchFunctionDetails as Any])
162163

163164
dispatchGroup.enter()
164-
let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString])
165-
166165
var hasLeftEpisodesGroup = false
167166
let episodesGroupQueue = DispatchQueue(label: "episodes.group")
168167

169-
let timeoutWorkItem = DispatchWorkItem {
170-
Logger.shared.log("Timeout for extractEpisodes", type: "Warning")
171-
episodesGroupQueue.sync {
172-
guard !hasLeftEpisodesGroup else {
173-
Logger.shared.log("extractEpisodes: timeout called but group already left", type: "Debug")
174-
return
175-
}
176-
hasLeftEpisodesGroup = true
177-
dispatchGroup.leave()
178-
}
179-
}
180-
DispatchQueue.main.asyncAfter(deadline: .now() + 5.0, execute: timeoutWorkItem)
181-
168+
let promiseValueEpisodes = extractEpisodesFunction.call(withArguments: [url.absoluteString])
182169
guard let promiseEpisodes = promiseValueEpisodes else {
183170
Logger.shared.log("extractEpisodes did not return a Promise", type: "Error")
184-
timeoutWorkItem.cancel()
185171
episodesGroupQueue.sync {
186172
guard !hasLeftEpisodesGroup else { return }
187173
hasLeftEpisodesGroup = true
@@ -192,7 +178,6 @@ extension JSController {
192178
}
193179

194180
let thenBlockEpisodes: @convention(block) (JSValue) -> Void = { result in
195-
timeoutWorkItem.cancel()
196181
episodesGroupQueue.sync {
197182
guard !hasLeftEpisodesGroup else {
198183
Logger.shared.log("extractEpisodes: thenBlock called but group already left", type: "Debug")
@@ -212,6 +197,7 @@ extension JSController {
212197
duration: nil
213198
)
214199
}
200+
Logger.shared.log("Successfully extracted \(episodeLinks.count) episodes", type: "Info")
215201
} else {
216202
Logger.shared.log("Failed to parse JSON of extractEpisodes", type: "Error")
217203
}
@@ -226,7 +212,6 @@ extension JSController {
226212
}
227213

228214
let catchBlockEpisodes: @convention(block) (JSValue) -> Void = { error in
229-
timeoutWorkItem.cancel()
230215
episodesGroupQueue.sync {
231216
guard !hasLeftEpisodesGroup else {
232217
Logger.shared.log("extractEpisodes: catchBlock called but group already left", type: "Debug")

0 commit comments

Comments
 (0)