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

Revert "f"

Browse source 
This reverts commit e7af55e4ed.
This commit is contained in:
cranci1 2025-07-15 15:43:40 +02:00
parent e7af55e4ed
commit 9bbd18574b
3 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Sora/Utlis & Misc/Extensions/JavaScriptCore+Extensions.swift
View file

@ -195,20 +195,12 @@ extension JSContext {
let callReject: (String) -> Void = { message in
DispatchQueue.main.async {
if !reject.isUndefined {
reject.call(withArguments: [message])
} else {
Logger.shared.log("Reject callback is undefined", type: "Error")
}
reject.call(withArguments: [message])
}
}
let callResolve: ([String: Any]) -> Void = { dict in
DispatchQueue.main.async {
if !resolve.isUndefined {
resolve.call(withArguments: [dict])
} else {
Logger.shared.log("Resolve callback is undefined", type: "Error")
}
resolve.call(withArguments: [dict])
}
}

17
Sora/Utlis & Misc/JSLoader/JSController-Details.swift
View file

@ -100,12 +100,8 @@ extension JSController {
guard let promiseDetails = promiseValueDetails else {
Logger.shared.log("extractDetails did not return a Promise", type: "Error")
detailsGroupQueue.sync {
guard !hasLeftDetailsGroup else {
Logger.shared.log("extractDetails: guard block called but group already left", type: "Debug")
return
}
guard !hasLeftDetailsGroup else { return }
hasLeftDetailsGroup = true
Logger.shared.log("Leaving dispatch group due to nil promise (details)", type: "Debug")
dispatchGroup.leave()
}
completion([], [])
@ -140,7 +136,6 @@ extension JSController {
} else {
Logger.shared.log("Result is not a string of extractDetails", type: "Error")
}
Logger.shared.log("Leaving dispatch group from details thenBlock", type: "Debug")
dispatchGroup.leave()
}
}
@ -154,7 +149,6 @@ extension JSController {
hasLeftDetailsGroup = true
Logger.shared.log("Promise rejected of extractDetails: \(String(describing: error.toString()))", type: "Error")
Logger.shared.log("Leaving dispatch group from details catchBlock", type: "Debug")
dispatchGroup.leave()
}
}
@ -179,7 +173,6 @@ extension JSController {
return
}
hasLeftEpisodesGroup = true
Logger.shared.log("Leaving dispatch group due to timeout", type: "Debug")
dispatchGroup.leave()
}
}
@ -189,12 +182,8 @@ extension JSController {
Logger.shared.log("extractEpisodes did not return a Promise", type: "Error")
timeoutWorkItem.cancel()
episodesGroupQueue.sync {
guard !hasLeftEpisodesGroup else {
Logger.shared.log("extractEpisodes: guard block called but group already left", type: "Debug")
return
}
guard !hasLeftEpisodesGroup else { return }
hasLeftEpisodesGroup = true
Logger.shared.log("Leaving dispatch group due to nil promise", type: "Debug")
dispatchGroup.leave()
}
completion([], [])
@ -231,7 +220,6 @@ extension JSController {
} else {
Logger.shared.log("Result is not a string of extractEpisodes", type: "Error")
}
Logger.shared.log("Leaving dispatch group from thenBlock", type: "Debug")
dispatchGroup.leave()
}
}
@ -246,7 +234,6 @@ extension JSController {
hasLeftEpisodesGroup = true
Logger.shared.log("Promise rejected of extractEpisodes: \(String(describing: error.toString()))", type: "Error")
Logger.shared.log("Leaving dispatch group from catchBlock", type: "Debug")
dispatchGroup.leave()
}
}

6
Sora/Views/SettingsView/SettingsSubViews/SettingsViewPlayer.swift
View file

@ -305,10 +305,10 @@ struct SettingsViewPlayer: View {
}
SettingsSection(title: NSLocalizedString("Progress bar Marker Color", comment: "")) {
ColorPicker(NSLocalizedString("Segments Color", comment: ""), selection: Binding<Color>(
ColorPicker(NSLocalizedString("Segments Color", comment: ""), selection: Binding(
get: {
if let data = UserDefaults.standard.data(forKey: "segmentsColorData"),
let uiColor = try? NSKeyedUnarchiver.unarchivedObject(ofClass: UIColor.self, from: data) {
let uiColor = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(data) as? UIColor {
return Color(uiColor)
}
return .yellow
@ -322,7 +322,7 @@ struct SettingsViewPlayer: View {
UserDefaults.standard.set(data, forKey: "segmentsColorData")
}
}
), supportsOpacity: false)
))
.padding(.horizontal, 16)
.padding(.vertical, 12)
}