Creepso/Sora
1
0
Fork 0
mirror of https://github.com/cranci1/Sora.git synced 2026-01-11 20:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

I'm fr going to sleep after this

Browse source
This commit is contained in:
scigward 2025-08-20 10:22:29 +03:00
parent 1d50bc9985
commit 6d263b6400
2 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Sora/Utlis & Misc/JSLoader/Downloads/JSController-Downloads.swift
View file

@ -1226,22 +1226,40 @@ extension JSController: AVAssetDownloadDelegate {
// If there's a subtitle URL, download it now that the video is saved
// Also fetch OP/ED skip timestamps in parallel and save simple sidecar JSON next to the video
if download.metadata?.episode != nil && download.type == .episode {
if download.metadata?.episode != nil && download.type == .episode {
// Ensure we have MAL ID just like the streaming path (CustomPlayer)
if download.malID == nil, let aid = download.aniListID {
AniListMutation().fetchMalID(animeId: aid) { [weak self] result in
switch result {
case .success(let mal):
// Update the active download in-place with MAL ID
// Replace the download entry with a new instance carrying MAL ID
if let idx = self?.activeDownloads.firstIndex(where: { $0.id == download.id }) {
var updated = self?.activeDownloads[idx]
updated?.malID = mal
if let up = updated { self?.activeDownloads[idx] = up }
self?.fetchSkipTimestampsFor(request: up, persistentURL: persistentURL) { ok in
let cur = self?.activeDownloads[idx] ?? download
let updated = JSActiveDownload(
id: cur.id,
originalURL: cur.originalURL,
progress: cur.progress,
task: cur.task,
urlSessionTask: cur.urlSessionTask,
queueStatus: cur.queueStatus,
type: cur.type,
metadata: cur.metadata,
title: cur.title,
imageURL: cur.imageURL,
subtitleURL: cur.subtitleURL,
asset: cur.asset,
headers: cur.headers,
module: cur.module,
aniListID: cur.aniListID,
malID: mal,
isFiller: cur.isFiller
)
self?.activeDownloads[idx] = updated
self?.fetchSkipTimestampsFor(request: updated, persistentURL: persistentURL) { ok in
if ok {
Logger.shared.log("[SkipSidecar] Saved OP/ED sidecar for episode \(up.metadata?.episode ?? -1) at: \(persistentURL.path)", type: "Download")
Logger.shared.log("[SkipSidecar] Saved OP/ED sidecar for episode \(updated.metadata?.episode ?? -1) at: \(persistentURL.path)", type: "Download")
} else {
Logger.shared.log("[SkipSidecar] Failed to save sidecar for episode \(up.metadata?.episode ?? -1)", type: "Download")
Logger.shared.log("[SkipSidecar] Failed to save sidecar for episode \(updated.metadata?.episode ?? -1)", type: "Download")
}
}
}
@ -1261,8 +1279,6 @@ if download.metadata?.episode != nil && download.type == .episode {
}
}
}
if let subtitleURL = download.subtitleURL {
downloadSubtitle(subtitleURL: subtitleURL, assetID: newAsset.id.uuidString)
} else {
@ -1279,7 +1295,7 @@ if download.metadata?.episode != nil && download.type == .episode {
])
}
}
// Clean up the download task
cleanupDownloadTask(assetDownloadTask)

4
Sora/Views/DownloadView.swift
View file

@ -1399,8 +1399,8 @@ struct EnhancedEpisodeRow: View {
.padding(.horizontal, 8)
.padding(.vertical, 4)
.background(
Capsule()
.fill(Color.red.opacity(colorScheme == .dark ? 0.20 : 0.10))
Color.red.opacity(colorScheme == .dark ? 0.20 : 0.10)
.clipShape(Capsule())
)
.overlay(
Capsule()