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

please work

Browse source
This commit is contained in:
scigward 2025-08-17 01:43:35 +03:00
parent f5d8b75388
commit 7ea99174e6
2 changed files with 74 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,8 +154,11 @@ struct EpisodeCell: View {
updateProgress() updateProgress()
} }
} }
}
private extension EpisodeCell {
private var actionButtonsBackground: some View { var actionButtonsBackground: some View {
HStack { HStack {
Spacer() Spacer()
actionButtons actionButtons
@ -163,7 +166,7 @@ struct EpisodeCell: View {
.zIndex(0) .zIndex(0)
} }
private var episodeCellContent: some View { var episodeCellContent: some View {
HStack { HStack {
episodeThumbnail episodeThumbnail
episodeInfo episodeInfo
@ -200,7 +203,7 @@ struct EpisodeCell: View {
.onTapGesture { handleTap() } .onTapGesture { handleTap() }
} }
private var cellBackground: some View { var cellBackground: some View {
RoundedRectangle(cornerRadius: 15) RoundedRectangle(cornerRadius: 15)
.fill(Color(UIColor.systemBackground)) .fill(Color(UIColor.systemBackground))
.overlay( .overlay(
@ -223,7 +226,7 @@ struct EpisodeCell: View {
) )
} }
private var episodeThumbnail: some View { var episodeThumbnail: some View {
ZStack { ZStack {
AsyncImageView( AsyncImageView(
url: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl, url: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl,
@ -238,7 +241,7 @@ struct EpisodeCell: View {
} }
} }
private var episodeInfo: some View { var episodeInfo: some View {
VStack(alignment: .leading) { VStack(alignment: .leading) {
HStack(spacing: 8) { HStack(spacing: 8) {
Text("Episode \(episodeID + 1)") Text("Episode \(episodeID + 1)")
@ -270,13 +273,13 @@ struct EpisodeCell: View {
} }
} }
private var downloadedIndicator: some View { var downloadedIndicator: some View {
Image(systemName: "externaldrive.fill.badge.checkmark") Image(systemName: "externaldrive.fill.badge.checkmark")
.foregroundColor(.accentColor) .foregroundColor(.accentColor)
.font(.system(size: 18)) .font(.system(size: 18))
} }
private var contextMenuContent: some View { var contextMenuContent: some View {
Group { Group {
if progress <= 0.9 { if progress <= 0.9 {
Button(action: markAsWatched) { Button(action: markAsWatched) {
@ -302,7 +305,7 @@ struct EpisodeCell: View {
} }
} }
private var actionButtons: some View { var actionButtons: some View {
HStack(spacing: 8) { HStack(spacing: 8) {
ActionButton( ActionButton(
icon: "arrow.down.circle", icon: "arrow.down.circle",
@ -348,8 +351,11 @@ struct EpisodeCell: View {
} }
.padding(.horizontal, 8) .padding(.horizontal, 8)
} }
}
private extension EpisodeCell {
private enum DragState { enum DragState {
case inactive case inactive
case pressing case pressing
case dragging(translation: CGSize) case dragging(translation: CGSize)
@ -382,7 +388,7 @@ struct EpisodeCell: View {
} }
} }
private func handleDragChanged(_ value: DragGesture.Value) { func handleDragChanged(_ value: DragGesture.Value) {
let translation = value.translation let translation = value.translation
let velocity = value.velocity let velocity = value.velocity
@ -411,7 +417,7 @@ struct EpisodeCell: View {
} }
} }
private func handleDragEnded(_ value: DragGesture.Value) { func handleDragEnded(_ value: DragGesture.Value) {
let translation = value.translation let translation = value.translation
let velocity = value.velocity let velocity = value.velocity
@ -443,7 +449,7 @@ struct EpisodeCell: View {
} }
} }
private func handleTap() { func handleTap() {
if isShowingActions { if isShowingActions {
withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) { withAnimation(.spring(response: 0.3, dampingFraction: 0.8)) {
swipeOffset = 0 swipeOffset = 0
@ -457,7 +463,7 @@ struct EpisodeCell: View {
} }
} }
private func calculateMaxSwipeDistance() -> CGFloat { func calculateMaxSwipeDistance() -> CGFloat {
var buttonCount = 1 var buttonCount = 1
if progress <= 0.9 { buttonCount += 1 } if progress <= 0.9 { buttonCount += 1 }
@ -471,8 +477,11 @@ struct EpisodeCell: View {
return swipeDistance return swipeDistance
} }
}
private extension EpisodeCell {
private func closeActionsAndPerform(action: @escaping () -> Void) { func closeActionsAndPerform(action: @escaping () -> Void) {
withAnimation(.spring(response: 0.4, dampingFraction: 0.8)) { withAnimation(.spring(response: 0.4, dampingFraction: 0.8)) {
isShowingActions = false isShowingActions = false
swipeOffset = 0 swipeOffset = 0
@ -483,7 +492,7 @@ struct EpisodeCell: View {
} }
} }
private func markAsWatched() { func markAsWatched() {
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
let totalTime = 1000.0 let totalTime = 1000.0
defaults.set(totalTime, forKey: "lastPlayedTime_\(episode)") defaults.set(totalTime, forKey: "lastPlayedTime_\(episode)")
@ -500,30 +509,30 @@ struct EpisodeCell: View {
) { result in ) { result in
switch result { switch result {
case .success: case .success:
print("AniList sync: marked ep \(epNum) as \(newStatus)") Logger.shared.log("AniList sync: marked ep \(epNum) as \(newStatus)", type: "General")
case .failure(let err): case .failure(let err):
print("AniList sync failed: \(err.localizedDescription)") Logger.shared.log("AniList sync failed: \(err.localizedDescription)", type: "Error")
} }
} }
} }
} }
private func resetProgress() { func resetProgress() {
let userDefaults = UserDefaults.standard let userDefaults = UserDefaults.standard
userDefaults.set(0.0, forKey: "lastPlayedTime_\(episode)") userDefaults.set(0.0, forKey: "lastPlayedTime_\(episode)")
userDefaults.set(0.0, forKey: "totalTime_\(episode)") userDefaults.set(0.0, forKey: "totalTime_\(episode)")
updateProgress() updateProgress()
} }
private func updateProgress() { func updateProgress() {
let userDefaults = UserDefaults.standard let userDefaults = UserDefaults.standard
let lastPlayedTime = userDefaults.double(forKey: "lastPlayedTime_\(episode)") let lastPlayedTime = userDefaults.double(forKey: "lastPlayedTime_\(episode)")
let totalTime = userDefaults.double(forKey: "totalTime_\(episode)") let totalTime = userDefaults.double(forKey: "totalTime_\(episode)")
currentProgress = totalTime > 0 ? min(lastPlayedTime / totalTime, 1.0) : 0 currentProgress = totalTime > 0 ? min(lastPlayedTime / totalTime, 1.0) : 0
} }
private func updateDownloadStatus() { func updateDownloadStatus() {
let newStatus = jsController.isEpisodeDownloadedOrInProgress( let newStatus = jsController.isEpisodeDownloadedOrInProgress(
showTitle: parentTitle, showTitle: parentTitle,
episodeNumber: episodeID + 1 episodeNumber: episodeID + 1
@ -533,33 +542,38 @@ struct EpisodeCell: View {
downloadStatus = newStatus downloadStatus = newStatus
} }
} }
}
private func setupOnAppear() {
private extension EpisodeCell {
func setupOnAppear() {
updateProgress() updateProgress()
updateDownloadStatus() updateDownloadStatus()
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
if UserDefaults.standard.string(forKey: "metadataProviders") ?? "TMDB" == "TMDB" { if UserDefaults.standard.string(forKey: "metadataProviders") ?? "TMDB" == "TMDB" {
self.fetchTMDBEpisodeImage() fetchTMDBEpisodeImage()
} else { } else {
self.fetchAnimeEpisodeDetails() fetchAnimeEpisodeDetails()
} }
// Fetch filler info using Jikan API // Fetch filler info using Jikan API
fetchJikanFillerInfo() fetchJikanFillerInfo()
} }
} }
private func handleItemIDChange() { func handleItemIDChange() {
isLoading = true isLoading = true
retryAttempts = 0 retryAttempts = 0
fetchEpisodeDetails() fetchEpisodeDetails()
} }
private func fetchEpisodeDetails() { func fetchEpisodeDetails() {
fetchAnimeEpisodeDetails() fetchAnimeEpisodeDetails()
} }
}
private extension EpisodeCell {
private func downloadEpisode() { func downloadEpisode() {
updateDownloadStatus() updateDownloadStatus()
guard case .notDownloaded = downloadStatus, !isDownloading else { guard case .notDownloaded = downloadStatus, !isDownloading else {
@ -584,7 +598,7 @@ struct EpisodeCell: View {
} }
} }
private func handleAlreadyDownloadedOrInProgress() { func handleAlreadyDownloadedOrInProgress() {
switch downloadStatus { switch downloadStatus {
case .downloaded: case .downloaded:
DropManager.shared.info("Episode \(episodeID + 1) is already downloaded") DropManager.shared.info("Episode \(episodeID + 1) is already downloaded")
@ -595,7 +609,7 @@ struct EpisodeCell: View {
} }
} }
private func tryNextDownloadMethod(methodIndex: Int, downloadID: UUID, softsub: Bool) { func tryNextDownloadMethod(methodIndex: Int, downloadID: UUID, softsub: Bool) {
guard isDownloading else { return } guard isDownloading else { return }
switch methodIndex { switch methodIndex {
@ -628,7 +642,7 @@ struct EpisodeCell: View {
} }
} }
private func handleDownloadResult( func handleDownloadResult(
_ result: (streams: [String]?, subtitles: [String]?, sources: [[String: Any]]?), _ result: (streams: [String]?, subtitles: [String]?, sources: [[String: Any]]?),
downloadID: UUID, downloadID: UUID,
methodIndex: Int, methodIndex: Int,
@ -667,7 +681,7 @@ struct EpisodeCell: View {
tryNextDownloadMethod(methodIndex: methodIndex + 1, downloadID: downloadID, softsub: softsub) tryNextDownloadMethod(methodIndex: methodIndex + 1, downloadID: downloadID, softsub: softsub)
} }
private func startActualDownload(url: URL, streamUrl: String, downloadID: UUID, subtitleURL: URL? = nil) { func startActualDownload(url: URL, streamUrl: String, downloadID: UUID, subtitleURL: URL? = nil) {
let headers = createDownloadHeaders(for: url) let headers = createDownloadHeaders(for: url)
let episodeThumbnailURL = URL(string: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl) let episodeThumbnailURL = URL(string: episodeImageUrl.isEmpty ? defaultBannerImage : episodeImageUrl)
let showPosterImageURL = URL(string: showPosterURL ?? defaultBannerImage) let showPosterImageURL = URL(string: showPosterURL ?? defaultBannerImage)
@ -690,7 +704,7 @@ struct EpisodeCell: View {
showPosterURL: showPosterImageURL showPosterURL: showPosterImageURL
) { success, message in ) { success, message in
if success { if success {
print("Started download for Episode \(self.episodeID + 1): \(self.episode)") Logger.shared.log("Started download for Episode \(self.episodeID + 1): \(self.episode)", type: "Download")
AnalyticsManager.shared.sendEvent( AnalyticsManager.shared.sendEvent(
event: "download", event: "download",
additionalData: ["episode": self.episodeID + 1, "url": streamUrl] additionalData: ["episode": self.episodeID + 1, "url": streamUrl]
@ -702,7 +716,7 @@ struct EpisodeCell: View {
} }
} }
private func createDownloadHeaders(for url: URL) -> [String: String] { func createDownloadHeaders(for url: URL) -> [String: String] {
if !module.metadata.baseUrl.isEmpty && !module.metadata.baseUrl.contains("undefined") { if !module.metadata.baseUrl.isEmpty && !module.metadata.baseUrl.contains("undefined") {
return [ return [
"Origin": module.metadata.baseUrl, "Origin": module.metadata.baseUrl,
@ -732,8 +746,11 @@ struct EpisodeCell: View {
return [:] return [:]
} }
} }
}
private extension EpisodeCell {
private func showDownloadStreamSelectionAlert(streams: [Any], downloadID: UUID, subtitleURL: String? = nil) { func showDownloadStreamSelectionAlert(streams: [Any], downloadID: UUID, subtitleURL: String? = nil) {
DispatchQueue.main.async { DispatchQueue.main.async {
let alert = UIAlertController( let alert = UIAlertController(
title: "Select Download Server", title: "Select Download Server",
@ -751,7 +768,7 @@ struct EpisodeCell: View {
} }
} }
private func addStreamActions(to alert: UIAlertController, streams: [Any], downloadID: UUID, subtitleURL: String?) { func addStreamActions(to alert: UIAlertController, streams: [Any], downloadID: UUID, subtitleURL: String?) {
var index = 0 var index = 0
var streamIndex = 1 var streamIndex = 1
@ -774,7 +791,7 @@ struct EpisodeCell: View {
} }
} }
private func parseStreamInfo(streams: [Any], index: Int, streamIndex: Int) -> (title: String, streamUrl: String, newIndex: Int) { func parseStreamInfo(streams: [Any], index: Int, streamIndex: Int) -> (title: String, streamUrl: String, newIndex: Int) {
if let streams = streams as? [String] { if let streams = streams as? [String] {
if index + 1 < streams.count && !streams[index].lowercased().contains("http") { if index + 1 < streams.count && !streams[index].lowercased().contains("http") {
return (streams[index], streams[index + 1], index + 2) return (streams[index], streams[index + 1], index + 2)
@ -790,7 +807,7 @@ struct EpisodeCell: View {
return ("Server \(streamIndex)", "", index + 1) return ("Server \(streamIndex)", "", index + 1)
} }
private func presentAlert(_ alert: UIAlertController) { func presentAlert(_ alert: UIAlertController) {
guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene, guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
let window = windowScene.windows.first, let window = windowScene.windows.first,
let rootVC = window.rootViewController else { return } let rootVC = window.rootViewController else { return }
@ -811,7 +828,7 @@ struct EpisodeCell: View {
findTopViewController(rootVC).present(alert, animated: true) findTopViewController(rootVC).present(alert, animated: true)
} }
private func findTopViewController(_ controller: UIViewController) -> UIViewController { func findTopViewController(_ controller: UIViewController) -> UIViewController {
if let navigationController = controller as? UINavigationController { if let navigationController = controller as? UINavigationController {
return findTopViewController(navigationController.visibleViewController!) return findTopViewController(navigationController.visibleViewController!)
} }
@ -825,8 +842,11 @@ struct EpisodeCell: View {
} }
return controller return controller
} }
}
private extension EpisodeCell {
private func fetchAnimeEpisodeDetails() { func fetchAnimeEpisodeDetails() {
if let fetchMeta = UserDefaults.standard.object(forKey: "fetchEpisodeMetadata"), if let fetchMeta = UserDefaults.standard.object(forKey: "fetchEpisodeMetadata"),
!(fetchMeta as? Bool ?? true) { !(fetchMeta as? Bool ?? true) {
DispatchQueue.main.async { DispatchQueue.main.async {
@ -837,17 +857,17 @@ struct EpisodeCell: View {
} }
guard let url = URL(string: "https://api.ani.zip/mappings?anilist_id=\(itemID)") else { guard let url = URL(string: "https://api.ani.zip/mappings?anilist_id=\(itemID)") else {
isLoading = false isLoading = false
print("Invalid URL for itemID: \(itemID)") Logger.shared.log("Invalid URL for itemID: \(itemID)", type: "Error")
return return
} }
if retryAttempts > 0 { if retryAttempts > 0 {
print("Retrying episode details fetch (attempt \(retryAttempts)/\(maxRetryAttempts))") Logger.shared.log("Retrying episode details fetch (attempt \(retryAttempts)/\(maxRetryAttempts))", type: "Debug")
} }
URLSession.custom.dataTask(with: url) { data, response, error in URLSession.custom.dataTask(with: url) { data, response, error in
if let error = error { if let error = error {
print("Failed to fetch anime episode details: \(error)") Logger.shared.log("Failed to fetch anime episode details: \(error)", type: "Error")
self.handleFetchFailure(error: error) self.handleFetchFailure(error: error)
return return
} }
@ -861,7 +881,7 @@ struct EpisodeCell: View {
}.resume() }.resume()
} }
private func processAnimeEpisodeData(_ data: Data) { func processAnimeEpisodeData(_ data: Data) {
do { do {
let jsonObject = try JSONSerialization.jsonObject(with: data, options: []) let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
guard let json = jsonObject as? [String: Any], guard let json = jsonObject as? [String: Any],
@ -872,7 +892,7 @@ struct EpisodeCell: View {
let episodeKey = "\(episodeID + 1)" let episodeKey = "\(episodeID + 1)"
guard let episodeDetails = episodes[episodeKey] as? [String: Any] else { guard let episodeDetails = episodes[episodeKey] as? [String: Any] else {
print("Episode \(episodeKey) not found in response") Logger.shared.log("Episode \(episodeKey) not found in response", type: "Error")
DispatchQueue.main.async { DispatchQueue.main.async {
self.isLoading = false self.isLoading = false
self.retryAttempts = 0 self.retryAttempts = 0
@ -883,7 +903,7 @@ struct EpisodeCell: View {
updateEpisodeMetadata(from: episodeDetails) updateEpisodeMetadata(from: episodeDetails)
} catch { } catch {
print("JSON parsing error: \(error.localizedDescription)") Logger.shared.log("JSON parsing error: \(error.localizedDescription)", type: "Error")
DispatchQueue.main.async { DispatchQueue.main.async {
self.isLoading = false self.isLoading = false
self.retryAttempts = 0 self.retryAttempts = 0
@ -891,7 +911,7 @@ struct EpisodeCell: View {
} }
} }
private func updateEpisodeMetadata(from episodeDetails: [String: Any]) { func updateEpisodeMetadata(from episodeDetails: [String: Any]) {
let title = episodeDetails["title"] as? [String: String] ?? [:] let title = episodeDetails["title"] as? [String: String] ?? [:]
let image = episodeDetails["image"] as? String ?? "" let image = episodeDetails["image"] as? String ?? ""
@ -910,7 +930,7 @@ struct EpisodeCell: View {
} }
} }
private func fetchTMDBEpisodeImage() { func fetchTMDBEpisodeImage() {
if let fetchMeta = UserDefaults.standard.object(forKey: "fetchEpisodeMetadata"), if let fetchMeta = UserDefaults.standard.object(forKey: "fetchEpisodeMetadata"),
!(fetchMeta as? Bool ?? true) { !(fetchMeta as? Bool ?? true) {
DispatchQueue.main.async { DispatchQueue.main.async {
@ -948,7 +968,7 @@ struct EpisodeCell: View {
} }
} }
} catch { } catch {
print("Failed to parse TMDB episode details: \(error.localizedDescription)") Logger.shared.log("Failed to parse TMDB episode details: \(error.localizedDescription)", type: "Error")
DispatchQueue.main.async { DispatchQueue.main.async {
self.isLoading = false self.isLoading = false
} }
@ -1032,8 +1052,6 @@ struct EpisodeCell: View {
do { do {
let response = try JSONDecoder().decode(JikanResponse.self, from: data) let response = try JSONDecoder().decode(JikanResponse.self, from: data)
completion(response.data) completion(response.data)
let response = try JSONDecoder().decode(JikanResponse.self, from: data)
completion(response.data)
} catch { } catch {
Logger.shared.log("Failed to parse Jikan response: \(error)", type: "Error") Logger.shared.log("Failed to parse Jikan response: \(error)", type: "Error")
completion(nil) completion(nil)
@ -1068,13 +1086,13 @@ struct EpisodeCell: View {
self.retryAttempts += 1 self.retryAttempts += 1
let backoffDelay = self.initialBackoffDelay * pow(2.0, Double(self.retryAttempts - 1)) let backoffDelay = self.initialBackoffDelay * pow(2.0, Double(self.retryAttempts - 1))
print("Will retry episode details fetch in \(backoffDelay) seconds") Logger.shared.log("Will retry episode details fetch in \(backoffDelay) seconds", type: "Debug")
DispatchQueue.main.asyncAfter(deadline: .now() + backoffDelay) { DispatchQueue.main.asyncAfter(deadline: .now() + backoffDelay) {
self.fetchAnimeEpisodeDetails() self.fetchAnimeEpisodeDetails()
} }
} else { } else {
print("Failed to fetch episode details after \(self.maxRetryAttempts) attempts") Logger.shared.log("Failed to fetch episode details after \(self.maxRetryAttempts) attempts", type: "Error")
self.isLoading = false self.isLoading = false
self.retryAttempts = 0 self.retryAttempts = 0
} }
@ -1133,6 +1151,9 @@ private struct AsyncImageView: View {
.cornerRadius(8) .cornerRadius(8)
} else if state.error != nil { } else if state.error != nil {
placeholderView placeholderView
.onAppear {
Logger.shared.log("Failed to load episode image: \(state.error?.localizedDescription ?? "Unknown error")", type: "Error")
}
} else { } else {
placeholderView placeholderView
} }

10
Sora/Views/MediaInfoView/Matching/AnilistMatchView.swift
View file

@ -53,7 +53,6 @@ struct AnilistMatchPopupView: View {
let result = results[index] let result = results[index]
Button(action: { Button(action: {
if let id = result["id"] as? Int { if let id = result["id"] as? Int {
let malID = result["mal_id"] as? Int?
let title = result["title"] as? String ?? seriesTitle let title = result["title"] as? String ?? seriesTitle
let malId = result["mal_id"] as? Int let malId = result["mal_id"] as? Int
Logger.shared.log("Selected AniList ID: \(id), MAL ID: \(malId?.description ?? "nil")", type: "AnilistMatch") Logger.shared.log("Selected AniList ID: \(id), MAL ID: \(malId?.description ?? "nil")", type: "AnilistMatch")
@ -180,7 +179,6 @@ struct AnilistMatchPopupView: View {
media(search: "\(seriesTitle)", type: ANIME) { media(search: "\(seriesTitle)", type: ANIME) {
id id
idMal idMal
idMal
title { title {
romaji romaji
english english
@ -197,9 +195,7 @@ struct AnilistMatchPopupView: View {
var request = URLRequest(url: url) var request = URLRequest(url: url)
request.httpMethod = "POST" request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type") request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.httpBody = try? JSONSerialization.data(withJSONObject: ["query": query])
let requestBody: [String: Any] = ["query": query]
request.httpBody = try? JSONSerialization.data(withJSONObject: requestBody)
URLSession.shared.dataTask(with: request) { data, _, _ in URLSession.shared.dataTask(with: request) { data, _, _ in
DispatchQueue.main.async { DispatchQueue.main.async {
@ -215,10 +211,6 @@ struct AnilistMatchPopupView: View {
results = mediaList.map { media in results = mediaList.map { media in
let titleInfo = media["title"] as? [String: Any] let titleInfo = media["title"] as? [String: Any]
let cover = (media["coverImage"] as? [String: Any])?["large"] as? String let cover = (media["coverImage"] as? [String: Any])?["large"] as? String
let malID = media["idMal"] as? Int
print("Found AniList ID: \(media["id"] ?? "nil"), MAL ID: \(malID?.description ?? "nil")")
return [ return [
"id": media["id"] ?? 0, "id": media["id"] ?? 0,
"mal_id": media["idMal"] as? Int, // <-- MAL ID "mal_id": media["idMal"] as? Int, // <-- MAL ID