echo/Luminate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Migrate Swift Language Mode From V5 To V6"

Browse source 
This reverts commit 45cbfb418b.
This commit is contained in:
Brendan Szymanski 2026-06-16 00:41:29 -04:00
parent 45cbfb418b
commit 9a779148fb
18 changed files with 103 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Package.swift
View file

@ -85,5 +85,5 @@ let package = Package(
plugins: [.plugin(name: "GenerateLocalized", package: "localized")] plugins: [.plugin(name: "GenerateLocalized", package: "localized")]
), ),
], ],
swiftLanguageModes: [.v6] swiftLanguageModes: [.v5]
) )

27
Sources/Luminate/Luminate.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/14/26. // Created by Brendan Szymanski on 6/14/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
@ -15,20 +15,15 @@ import LuminateUI
@main @main
struct Luminate: App { struct Luminate: App {
nonisolated(unsafe) let app = AdwaitaApp(id: "dev.bscubed.Luminate") let app = AdwaitaApp(id: "dev.bscubed.Luminate")
@State private nonisolated(unsafe) var client: JellyfinClient? @State private var client: JellyfinClient?
@State private nonisolated(unsafe) var userId = "" @State private var userId = ""
@State private nonisolated(unsafe) var isLaunchLoading = true @State private var isLaunchLoading = true
init() { init() {
Task { @MainActor in ObservationRegistrar.onChange = { StateManager.updateViews() }
ObservationRegistrar.onChange = { StateManager.updateViews() } if let store = try? SQLiteStore(dbURL: SQLiteStore.defaultDatabaseURL()) {
} DIContainer.shared.register(\.persistence, value: store)
let dbURL = SQLiteStore.defaultDatabaseURL()
Task { [dbURL] in
if let store = try? await SQLiteStore(dbURL: dbURL) {
DIContainer.shared.register(\.persistence, value: store)
}
} }
DIContainer.shared.register(\.imageService, value: ImageService()) DIContainer.shared.register(\.imageService, value: ImageService())
DIContainer.shared.register(\.pageAnimationTracker, value: PageAnimationTracker()) DIContainer.shared.register(\.pageAnimationTracker, value: PageAnimationTracker())
@ -68,11 +63,11 @@ struct Luminate: App {
} }
private func loadSavedSession() { private func loadSavedSession() {
Task { [self] in Task {
do { do {
defer { isLaunchLoading = false } defer { isLaunchLoading = false }
let store = try await SQLiteStore(dbURL: SQLiteStore.defaultDatabaseURL()) let store = try SQLiteStore(dbURL: SQLiteStore.defaultDatabaseURL())
let auth = try await store.loadAuth() let auth = try await store.loadAuth()
guard let serverURL = URL(string: auth.serverURL) else { return } guard let serverURL = URL(string: auth.serverURL) else { return }
@ -97,7 +92,7 @@ struct ContentView: View {
var client: JellyfinClient var client: JellyfinClient
var userId: String var userId: String
@State nonisolated(unsafe) var stack: NavigationStack<Page> = .init() @State var stack: NavigationStack<Page> = .init()
@Injected(\.pageAnimationTracker) var pageAnimationTracker @Injected(\.pageAnimationTracker) var pageAnimationTracker
var view: Body { var view: Body {

20
Sources/Luminate/Pages/HomeView.swift
View file

@ -5,26 +5,26 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
import LuminateUI import LuminateUI
public struct HomeView: View { public struct HomeView: View {
public init(navigation: Binding<NavigationStack<Page>>) { nonisolated public init(navigation: Binding<NavigationStack<Page>>) {
_navigation = navigation _navigation = navigation
} }
@Injected(\.client) var client @Injected(\.client) var client
@Injected(\.userId) var userId @Injected(\.userId) var userId
@Binding nonisolated(unsafe) var navigation: NavigationStack<Page> @Binding var navigation: NavigationStack<Page>
@State private nonisolated(unsafe) var resumeItems: [Components.Schemas.BaseItemDto] = [] @State private var resumeItems: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var nextUpItems: [Components.Schemas.BaseItemDto] = [] @State private var nextUpItems: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var latestItems: [Components.Schemas.BaseItemDto] = [] @State private var latestItems: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var libraries: [Components.Schemas.BaseItemDto] = [] @State private var libraries: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var isLoading = true @State private var isLoading = true
@State private nonisolated(unsafe) var isLoadingData = false @State private var isLoadingData = false
public var view: Body { public var view: Body {
ScrollView { ScrollView {
@ -96,7 +96,7 @@ public struct HomeView: View {
} }
private func loadHomeData() { private func loadHomeData() {
Task { [self] in Task {
async let resume = client.getItems( async let resume = client.getItems(
userId: userId, userId: userId,
filters: [.isResumable], filters: [.isResumable],

4
Sources/Luminate/Pages/LibraryPage.swift
View file

@ -11,7 +11,7 @@ import LuminateUI
public struct LibraryPage: View { public struct LibraryPage: View {
public init( nonisolated public init(
title: String, items: [Components.Schemas.BaseItemDto], title: String, items: [Components.Schemas.BaseItemDto],
navigation: Binding<NavigationStack<Page>> navigation: Binding<NavigationStack<Page>>
) { ) {
@ -22,7 +22,7 @@ public struct LibraryPage: View {
private var items: [Components.Schemas.BaseItemDto] private var items: [Components.Schemas.BaseItemDto]
private var title: String private var title: String
@Binding nonisolated(unsafe) var navigation: NavigationStack<Page> @Binding var navigation: NavigationStack<Page>
public var view: Body { public var view: Body {
ScrollView { ScrollView {

18
Sources/Luminate/ServerSetupView.swift
View file

@ -5,21 +5,21 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
public struct ServerSetupView: View { public struct ServerSetupView: View {
@State private nonisolated(unsafe) var serverURL = "" @State private var serverURL = ""
@State private nonisolated(unsafe) var username = "" @State private var username = ""
@State private nonisolated(unsafe) var password = "" @State private var password = ""
@State private nonisolated(unsafe) var isLoading = false @State private var isLoading = false
@State private nonisolated(unsafe) var error: String? @State private var error: String?
public var onLogin: @Sendable (JellyfinClient, String) -> Void public var onLogin: (JellyfinClient, String) -> Void
public init(onLogin: @escaping @Sendable (JellyfinClient, String) -> Void) { public init(onLogin: @escaping (JellyfinClient, String) -> Void) {
self.onLogin = onLogin self.onLogin = onLogin
} }
@ -65,7 +65,7 @@ public struct ServerSetupView: View {
} }
isLoading = true isLoading = true
error = nil error = nil
Task { [self] in Task {
do { do {
let client = JellyfinClient(serverURL: url) let client = JellyfinClient(serverURL: url)
let result = try await client.authenticate(username: username, password: password) let result = try await client.authenticate(username: username, password: password)

1
Sources/LuminateCore/Observation.swift
View file

@ -20,7 +20,6 @@ import Foundation
/// ```swift /// ```swift
/// ObservationRegistrar.onChange = { StateManager.updateViews() } /// ObservationRegistrar.onChange = { StateManager.updateViews() }
/// ``` /// ```
@MainActor
public class ObservationRegistrar { public class ObservationRegistrar {
/// Global callback invoked when any tracked property changes. /// Global callback invoked when any tracked property changes.

4
Sources/LuminateCore/SQLiteStore.swift
View file

@ -14,7 +14,7 @@ public actor SQLiteStore: PersistenceService {
private let db: Connection private let db: Connection
public init(dbURL: URL) async throws { public init(dbURL: URL) throws {
let directory = dbURL.deletingLastPathComponent() let directory = dbURL.deletingLastPathComponent()
try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true) try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
db = try Connection(dbURL.path) db = try Connection(dbURL.path)
@ -23,7 +23,7 @@ public actor SQLiteStore: PersistenceService {
try migrate() try migrate()
} }
private nonisolated func migrate() throws { private func migrate() throws {
let version = db.userVersion let version = db.userVersion
switch version { switch version {
case 0: case 0:

2
Sources/LuminateDI/Injected.swift
View file

@ -28,7 +28,7 @@ public struct Injected<T> {
} }
} }
private final class ObserverRef: @unchecked Sendable { private final class ObserverRef {
let id: UUID let id: UUID
init(id: UUID) { self.id = id } init(id: UUID) { self.id = id }
deinit { DIContainer.shared.removeObserver(id) } deinit { DIContainer.shared.removeObserver(id) }

18
Sources/LuminatePlayer/PlayerView.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
@ -17,11 +17,11 @@ public struct PlayerView: View {
public var mediaSourceId: String public var mediaSourceId: String
public var playSessionId: String public var playSessionId: String
public var streamURL: URL public var streamURL: URL
@State private nonisolated(unsafe) var isPlaying = true @State private var isPlaying = true
@State private nonisolated(unsafe) var position: Double = 0 @State private var position: Double = 0
@State private nonisolated(unsafe) var duration: Double = 0 @State private var duration: Double = 0
@State private nonisolated(unsafe) var showControls = true @State private var showControls = true
public var onClose: @Sendable () -> Void public var onClose: () -> Void
public init( public init(
item: Components.Schemas.BaseItemDto, item: Components.Schemas.BaseItemDto,
@ -30,7 +30,7 @@ public struct PlayerView: View {
mediaSourceId: String, mediaSourceId: String,
playSessionId: String, playSessionId: String,
streamURL: URL, streamURL: URL,
onClose: @escaping @Sendable () -> Void onClose: @escaping () -> Void
) { ) {
self.item = item self.item = item
self.client = client self.client = client
@ -70,7 +70,7 @@ public struct PlayerView: View {
} }
private func startPlayback() { private func startPlayback() {
Task { [self] in Task {
try? await client.reportPlaybackStart( try? await client.reportPlaybackStart(
info: .init( info: .init(
itemId: item.id, itemId: item.id,
@ -82,7 +82,7 @@ public struct PlayerView: View {
} }
private func stopPlayback() { private func stopPlayback() {
Task { [self] in Task {
try? await client.reportPlaybackStopped( try? await client.reportPlaybackStopped(
info: .init( info: .init(
itemId: item.id, itemId: item.id,

12
Sources/LuminateUI/Components/EpisodeList.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
@ -15,7 +15,7 @@ struct EpisodeList: View {
var seasonId: String var seasonId: String
var client: JellyfinClient var client: JellyfinClient
var userId: String var userId: String
@State private nonisolated(unsafe) var episodes: [Components.Schemas.BaseItemDto] = [] @State private var episodes: [Components.Schemas.BaseItemDto] = []
var view: Body { var view: Body {
VStack { VStack {
@ -32,13 +32,13 @@ struct EpisodeList: View {
} }
private func loadEpisodes() { private func loadEpisodes() {
Task { [self] in Task {
let result = try? await client.getEpisodes( let result = try? await client.getEpisodes(
seriesId: seriesId, seriesId: seriesId,
userId: userId, userId: userId,
seasonId: seasonId seasonId: seasonId
) )
episodes = result?.items ?? [] await MainActor.run { episodes = result?.items ?? [] }
} }
} }
} }
@ -47,7 +47,7 @@ struct EpisodeRow: View {
var episode: Components.Schemas.BaseItemDto var episode: Components.Schemas.BaseItemDto
var client: JellyfinClient var client: JellyfinClient
@State private nonisolated(unsafe) var imageData: Data? @State private var imageData: Data?
var view: Body { var view: Body {
HStack { HStack {
@ -89,7 +89,7 @@ struct EpisodeRow: View {
guard let tag = episode.primaryImageTag, let itemId = episode.id else { guard let tag = episode.primaryImageTag, let itemId = episode.id else {
return return
} }
Task { [self] in Task {
guard guard
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, itemId: itemId,

6
Sources/LuminateUI/Components/HomePosterCell.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
@ -15,7 +15,7 @@ struct HomePosterCell: View {
var item: Components.Schemas.BaseItemDto var item: Components.Schemas.BaseItemDto
@Injected(\.client) var client @Injected(\.client) var client
@Injected(\.pageAnimationTracker) var pageAnimationTracker @Injected(\.pageAnimationTracker) var pageAnimationTracker
@State private nonisolated(unsafe) var imageData: Data? @State private var imageData: Data?
var view: Body { var view: Body {
VStack { VStack {
@ -67,7 +67,7 @@ struct HomePosterCell: View {
guard let tag = item.primaryImageTag, guard let tag = item.primaryImageTag,
let itemId = item.seriesId ?? item.id let itemId = item.seriesId ?? item.id
else { return } else { return }
Task { [self] in Task {
guard guard
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, itemId: itemId,

16
Sources/LuminateUI/Components/ItemGrid.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import LuminateCore import LuminateCore
public struct ItemGrid: View { public struct ItemGrid: View {
@ -15,8 +15,8 @@ public struct ItemGrid: View {
var parentId: String? var parentId: String?
var includeItemTypes: [Components.Schemas.BaseItemKind]? var includeItemTypes: [Components.Schemas.BaseItemKind]?
var title: String? var title: String?
@State private nonisolated(unsafe) var items: [Components.Schemas.BaseItemDto] = [] @State private var items: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var isLoading = false @State private var isLoading = false
private let pageSize: Int32 = 50 private let pageSize: Int32 = 50
public init( public init(
@ -58,7 +58,7 @@ public struct ItemGrid: View {
private func loadItems() { private func loadItems() {
isLoading = true isLoading = true
Task { [self] in Task {
do { do {
let result = try await client.getItems( let result = try await client.getItems(
userId: userId, userId: userId,
@ -71,10 +71,12 @@ public struct ItemGrid: View {
limit: pageSize, limit: pageSize,
recursive: true recursive: true
) )
items = result.items ?? [] await MainActor.run {
isLoading = false items = result.items ?? []
isLoading = false
}
} catch { } catch {
isLoading = false await MainActor.run { isLoading = false }
} }
} }
} }

2
Sources/LuminateUI/Components/LibraryGrid.swift
View file

@ -12,7 +12,7 @@ import LuminateCore
public struct LibraryGrid: View { public struct LibraryGrid: View {
public var libraries: [Components.Schemas.BaseItemDto] public var libraries: [Components.Schemas.BaseItemDto]
@Binding public nonisolated(unsafe) var navigation: NavigationStack<Page> @Binding public var navigation: NavigationStack<Page>
public var title: String? public var title: String?
public init( public init(

6
Sources/LuminateUI/Components/MediaRow.swift
View file

@ -13,14 +13,14 @@ public struct MediaRow: View {
public var title: String public var title: String
public var items: [Components.Schemas.BaseItemDto] public var items: [Components.Schemas.BaseItemDto]
@Binding public nonisolated(unsafe) var navigation: NavigationStack<Page> @Binding public var navigation: NavigationStack<Page>
public var onSeeAll: (@Sendable () -> Void)? public var onSeeAll: (() -> Void)?
public init( public init(
title: String, title: String,
items: [Components.Schemas.BaseItemDto], items: [Components.Schemas.BaseItemDto],
navigation: Binding<NavigationStack<Page>>, navigation: Binding<NavigationStack<Page>>,
onSeeAll: (@Sendable () -> Void)? = nil onSeeAll: (() -> Void)? = nil
) { ) {
self.title = title self.title = title
self.items = items self.items = items

24
Sources/LuminateUI/Components/MovieDetailView.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
@ -14,10 +14,10 @@ struct MovieDetailView: View {
var item: Components.Schemas.BaseItemDto var item: Components.Schemas.BaseItemDto
var client: JellyfinClient var client: JellyfinClient
var userId: String var userId: String
@State private nonisolated(unsafe) var isFavorite: Bool @State private var isFavorite: Bool
@State private nonisolated(unsafe) var isPlayed: Bool @State private var isPlayed: Bool
@State private nonisolated(unsafe) var similarItems: [Components.Schemas.BaseItemDto] = [] @State private var similarItems: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var backdropData: Data? @State private var backdropData: Data?
init(item: Components.Schemas.BaseItemDto, client: JellyfinClient, userId: String) { init(item: Components.Schemas.BaseItemDto, client: JellyfinClient, userId: String) {
self.item = item self.item = item
@ -115,7 +115,7 @@ struct MovieDetailView: View {
private func loadBackdrop() { private func loadBackdrop() {
guard let tag = item.backdropImageTag, let itemId = item.id else { return } guard let tag = item.backdropImageTag, let itemId = item.id else { return }
Task { [self] in Task {
guard guard
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, imageType: .backdrop, tag: tag, maxWidth: 1920 itemId: itemId, imageType: .backdrop, tag: tag, maxWidth: 1920
@ -127,7 +127,7 @@ struct MovieDetailView: View {
} }
private func loadSimilar() { private func loadSimilar() {
Task { [self] in Task {
let result = try? await client.getItems( let result = try? await client.getItems(
userId: userId, userId: userId,
includeItemTypes: [.movie], includeItemTypes: [.movie],
@ -136,29 +136,29 @@ struct MovieDetailView: View {
limit: 10, limit: 10,
recursive: true recursive: true
) )
similarItems = result?.items ?? [] await MainActor.run { similarItems = result?.items ?? [] }
} }
} }
private func toggleFavorite() { private func toggleFavorite() {
Task { [self] in Task {
if isFavorite { if isFavorite {
try? await client.unmarkFavoriteItem(itemId: item.id ?? "", userId: userId) try? await client.unmarkFavoriteItem(itemId: item.id ?? "", userId: userId)
} else { } else {
try? await client.markFavoriteItem(itemId: item.id ?? "", userId: userId) try? await client.markFavoriteItem(itemId: item.id ?? "", userId: userId)
} }
isFavorite.toggle() await MainActor.run { isFavorite.toggle() }
} }
} }
private func togglePlayed() { private func togglePlayed() {
Task { [self] in Task {
if isPlayed { if isPlayed {
try? await client.markUnplayedItem(itemId: item.id ?? "", userId: userId) try? await client.markUnplayedItem(itemId: item.id ?? "", userId: userId)
} else { } else {
try? await client.markPlayedItem(itemId: item.id ?? "", userId: userId) try? await client.markPlayedItem(itemId: item.id ?? "", userId: userId)
} }
isPlayed.toggle() await MainActor.run { isPlayed.toggle() }
} }
} }
} }

6
Sources/LuminateUI/Components/PosterCell.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
@ -15,7 +15,7 @@ struct PosterCell: View {
var item: Components.Schemas.BaseItemDto var item: Components.Schemas.BaseItemDto
var client: JellyfinClient var client: JellyfinClient
@Injected(\.pageAnimationTracker) var pageAnimationTracker @Injected(\.pageAnimationTracker) var pageAnimationTracker
@State private nonisolated(unsafe) var imageData: Data? @State private var imageData: Data?
var view: Body { var view: Body {
VStack { VStack {
@ -46,7 +46,7 @@ struct PosterCell: View {
guard let tag = item.primaryImageTag, guard let tag = item.primaryImageTag,
let itemId = item.id let itemId = item.id
else { return } else { return }
Task { [self] in Task {
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, itemId: itemId,
imageType: .primary, imageType: .primary,

20
Sources/LuminateUI/Components/SearchView.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
import LuminateDI import LuminateDI
@ -14,9 +14,9 @@ struct SearchView: View {
var client: JellyfinClient var client: JellyfinClient
var userId: String var userId: String
@State private nonisolated(unsafe) var searchText = "" @State private var searchText = ""
@State private nonisolated(unsafe) var results: [Components.Schemas.SearchHint] = [] @State private var results: [Components.Schemas.SearchHint] = []
@State private nonisolated(unsafe) var isSearching = false @State private var isSearching = false
var view: Body { var view: Body {
VStack { VStack {
@ -45,14 +45,16 @@ struct SearchView: View {
return return
} }
isSearching = true isSearching = true
Task { [self] in Task {
let result = try? await client.getSearchHints( let result = try? await client.getSearchHints(
searchTerm: searchText, searchTerm: searchText,
userId: userId, userId: userId,
limit: 50 limit: 50
) )
results = result?.searchHints ?? [] await MainActor.run {
isSearching = false results = result?.searchHints ?? []
isSearching = false
}
} }
} }
} }
@ -66,7 +68,7 @@ struct SearchResultRow: View {
var hint: Components.Schemas.SearchHint var hint: Components.Schemas.SearchHint
var client: JellyfinClient var client: JellyfinClient
@Injected(\.pageAnimationTracker) var pageAnimationTracker @Injected(\.pageAnimationTracker) var pageAnimationTracker
@State private nonisolated(unsafe) var imageData: Data? @State private var imageData: Data?
var view: Body { var view: Body {
HStack { HStack {
@ -116,7 +118,7 @@ struct SearchResultRow: View {
guard let tag = hint.primaryImageTag, guard let tag = hint.primaryImageTag,
let itemId = hint.id ?? hint.itemId let itemId = hint.id ?? hint.itemId
else { return } else { return }
Task { [self] in Task {
guard guard
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, imageType: .primary, tag: tag, maxWidth: 160 itemId: itemId, imageType: .primary, tag: tag, maxWidth: 160

18
Sources/LuminateUI/Components/TVShowView.swift
View file

@ -5,7 +5,7 @@
// Created by Brendan Szymanski on 6/5/26. // Created by Brendan Szymanski on 6/5/26.
// //
@preconcurrency import Adwaita import Adwaita
import Foundation import Foundation
import LuminateCore import LuminateCore
@ -14,9 +14,9 @@ struct TVShowView: View {
var item: Components.Schemas.BaseItemDto var item: Components.Schemas.BaseItemDto
var client: JellyfinClient var client: JellyfinClient
var userId: String var userId: String
@State private nonisolated(unsafe) var seasons: [Components.Schemas.BaseItemDto] = [] @State private var seasons: [Components.Schemas.BaseItemDto] = []
@State private nonisolated(unsafe) var selectedSeasonId: String? @State private var selectedSeasonId: String?
@State private nonisolated(unsafe) var backdropData: Data? @State private var backdropData: Data?
var view: Body { var view: Body {
ScrollView { ScrollView {
@ -86,7 +86,7 @@ struct TVShowView: View {
private func loadBackdrop() { private func loadBackdrop() {
guard let tag = item.backdropImageTag, let itemId = item.id else { return } guard let tag = item.backdropImageTag, let itemId = item.id else { return }
Task { [self] in Task {
guard guard
let url = await client.imageURL( let url = await client.imageURL(
itemId: itemId, imageType: .backdrop, tag: tag, maxWidth: 1920 itemId: itemId, imageType: .backdrop, tag: tag, maxWidth: 1920
@ -98,10 +98,12 @@ struct TVShowView: View {
} }
private func loadSeasons() { private func loadSeasons() {
Task { [self] in Task {
let result = try? await client.getSeasons(seriesId: item.id ?? "", userId: userId) let result = try? await client.getSeasons(seriesId: item.id ?? "", userId: userId)
seasons = result?.items ?? [] await MainActor.run {
selectedSeasonId = seasons.first?.id seasons = result?.items ?? []
selectedSeasonId = seasons.first?.id
}
} }
} }
} }