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

Fixed formatting and also watched status method

Browse source
This commit is contained in:
cranci1 2025-10-23 14:20:31 +02:00
parent 1c9b8339f5
commit f53cc505fc
1 changed files with 43 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
Sora/Views/MediaInfoView/EpisodeCell/EpisodeCell.swift
View file

@ -24,7 +24,6 @@ struct EpisodeCell: View {
let tmdbID: Int? let tmdbID: Int?
let seasonNumber: Int? let seasonNumber: Int?
//receives the set of filler episode numbers (from MediaInfoView)
let fillerEpisodes: Set<Int>? let fillerEpisodes: Set<Int>?
let isMultiSelectMode: Bool let isMultiSelectMode: Bool
@ -43,9 +42,8 @@ struct EpisodeCell: View {
@State private var downloadAnimationScale: CGFloat = 1.0 @State private var downloadAnimationScale: CGFloat = 1.0
@State private var activeDownloadTask: AVAssetDownloadTask? @State private var activeDownloadTask: AVAssetDownloadTask?
@State private var retryAttempts: Int = 0 @State private var retryAttempts: Int = 0
private var malIDFromParent: Int? { malID } private var malIDFromParent: Int? { malID }
private let maxRetryAttempts: Int = 3 private let maxRetryAttempts: Int = 3
private let initialBackoffDelay: TimeInterval = 1.0 private let initialBackoffDelay: TimeInterval = 1.0
@ -54,8 +52,7 @@ struct EpisodeCell: View {
@Environment(\.colorScheme) private var colorScheme @Environment(\.colorScheme) private var colorScheme
@AppStorage("selectedAppearance") private var selectedAppearance: Appearance = .system @AppStorage("selectedAppearance") private var selectedAppearance: Appearance = .system
@AppStorage("remainingTimePercentage") private var remainingTimePercentage: Double = 90.0 @AppStorage("remainingTimePercentage") private var remainingTimePercentage: Double = 90.0
// Filler state (derived from passed-in fillerEpisodes)
@State private var isFiller: Bool = false @State private var isFiller: Bool = false
init( init(
@ -79,7 +76,7 @@ struct EpisodeCell: View {
seasonNumber: Int? = nil, seasonNumber: Int? = nil,
fillerEpisodes: Set<Int>? = nil fillerEpisodes: Set<Int>? = nil
) { ) {
self.episodeIndex = episodeIndex self.episodeIndex = episodeIndex
self.episode = episode self.episode = episode
self.episodeID = episodeID self.episodeID = episodeID
@ -112,44 +109,43 @@ struct EpisodeCell: View {
var body: some View { var body: some View {
episodeCellContent episodeCellContent
.onAppear { .onAppear {
setupOnAppear() setupOnAppear()
// set filler state based on passed-in set (if available) let epNum = episodeID + 1
let epNum = episodeID + 1 if let set = fillerEpisodes {
if let set = fillerEpisodes { self.isFiller = set.contains(epNum)
self.isFiller = set.contains(epNum) }
} }
} .onChange(of: progress) { _ in updateProgress() }
.onChange(of: progress) { _ in updateProgress() } .onChange(of: itemID) { _ in handleItemIDChange() }
.onChange(of: itemID) { _ in handleItemIDChange() } .onChange(of: tmdbID) { _ in
.onChange(of: tmdbID) { _ in isLoading = true
isLoading = true retryAttempts = 0
retryAttempts = 0 fetchEpisodeDetails()
fetchEpisodeDetails()
}
.onChange(of: fillerEpisodes) { newValue in
let epNum = episodeID + 1
if let set = newValue {
self.isFiller = set.contains(epNum)
} else {
self.isFiller = false
} }
} .onChange(of: fillerEpisodes) { newValue in
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadProgressChanged"))) { _ in let epNum = episodeID + 1
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { if let set = newValue {
self.isFiller = set.contains(epNum)
} else {
self.isFiller = false
}
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadProgressChanged"))) { _ in
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
updateDownloadStatus()
updateProgress()
}
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadStatusChanged"))) { _ in
updateDownloadStatus() updateDownloadStatus()
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadCompleted"))) { _ in
updateDownloadStatus()
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("episodeProgressChanged"))) { _ in
updateProgress() updateProgress()
} }
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadStatusChanged"))) { _ in
updateDownloadStatus()
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("downloadCompleted"))) { _ in
updateDownloadStatus()
}
.onReceive(NotificationCenter.default.publisher(for: NSNotification.Name("episodeProgressChanged"))) { _ in
updateProgress()
}
} }
} }
@ -177,26 +173,26 @@ private extension EpisodeCell {
.clipShape(RoundedRectangle(cornerRadius: 15)) .clipShape(RoundedRectangle(cornerRadius: 15))
.contextMenu { contextMenuContent } .contextMenu { contextMenuContent }
.swipeActions(edge: .trailing) { .swipeActions(edge: .trailing) {
Button(action: { downloadEpisode() }) { Button(action: { downloadEpisode() }) {
Label("Download", systemImage: "arrow.down.circle") Label("Download", systemImage: "arrow.down.circle")
} }
.tint(.blue) .tint(.blue)
if progress >= (remainingTimePercentage / 100.0) { if progress <= remainingTimePercentage {
Button(action: { markAsWatched() }) { Button(action: { markAsWatched() }) {
Label("Watched", systemImage: "checkmark.circle") Label("Watched", systemImage: "checkmark.circle")
} }
.tint(.green) .tint(.green)
} }
if progress != 0 { if progress != 0 {
Button(action: { resetProgress() }) { Button(action: { resetProgress() }) {
Label("Reset", systemImage: "arrow.counterclockwise") Label("Reset", systemImage: "arrow.counterclockwise")
} }
.tint(.orange) .tint(.orange)
} }
if episodeIndex > 0 { if episodeIndex > 0 {
Button(action: { onMarkAllPrevious() }) { Button(action: { onMarkAllPrevious() }) {
Label("All Prev", systemImage: "checkmark.circle.fill") Label("All Prev", systemImage: "checkmark.circle.fill")
@ -285,7 +281,7 @@ private extension EpisodeCell {
var contextMenuContent: some View { var contextMenuContent: some View {
Group { Group {
if progress >= (remainingTimePercentage / 100.0) { if progress <= remainingTimePercentage {
Button(action: markAsWatched) { Button(action: markAsWatched) {
Label("Mark Episode as Watched", systemImage: "checkmark.circle") Label("Mark Episode as Watched", systemImage: "checkmark.circle")
} }
@ -312,7 +308,6 @@ private extension EpisodeCell {
} }
private extension EpisodeCell { private extension EpisodeCell {
func handleTap() { func handleTap() {
if isMultiSelectMode { if isMultiSelectMode {
onSelectionChanged?(!isSelected) onSelectionChanged?(!isSelected)
@ -321,11 +316,10 @@ private extension EpisodeCell {
onTap(imageUrl) onTap(imageUrl)
} }
} }
} }
private extension EpisodeCell { private extension EpisodeCell {
func markAsWatched() { func markAsWatched() {
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
let totalTime = 1000.0 let totalTime = 1000.0
@ -350,7 +344,6 @@ private extension EpisodeCell {
} }
} }
} }
func resetProgress() { func resetProgress() {
let userDefaults = UserDefaults.standard let userDefaults = UserDefaults.standard
@ -810,7 +803,6 @@ private extension EpisodeCell {
} }
}.resume() }.resume()
} }
func handleFetchFailure(error: Error) { func handleFetchFailure(error: Error) {
Logger.shared.log("Episode details fetch error: \(error.localizedDescription)", type: "Error") Logger.shared.log("Episode details fetch error: \(error.localizedDescription)", type: "Error")