wip

PreferencesView/Sources/PreferencesView/Box.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 class Box {

PreferencesView/Sources/PreferencesView/KeyCommandsBuilder.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import Foundation

PreferencesView/Sources/PreferencesView/PreferenceKeys.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

PreferencesView/Sources/PreferencesView/PreferencesView.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

PreferencesView/Sources/PreferencesView/UIPreferencesHostingController.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

PreferencesView/Sources/PreferencesView/UIViewController+Swizzling.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwizzleSwift

PreferencesView/Sources/PreferencesView/ViewExtensions.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

Shared/Coordinators/LibraryCoordinator.swift

@@ -67,8 +67,7 @@ final class LibraryCoordinator: NavigationCoordinatable {
                 Text("FIX ME")
             } else {
                 LibraryView(parent: parent, filters: parameters.filters)
-
-
+
 //                LibraryView(viewModel: LibraryViewModel(
 //                    parent: parent,
 //                    type: parameters.type,
@@ -98,7 +97,7 @@ final class LibraryCoordinator: NavigationCoordinatable {
     func makeLibrary(parameters: LibraryCoordinator.Parameters) -> LibraryCoordinator {
         LibraryCoordinator(parameters: parameters)
     }
-    
+
 //    func makeFolderLibrary() -> LibraryCoordinator {
 //        LibraryCoordinator(parameters: .init(parent: <#T##LibraryParent#>, filters: <#T##ItemFilters#>))
 //    }

Shared/Coordinators/MediaCoordinator.swift

@@ -37,7 +37,7 @@ final class MediaCoordinator: NavigationCoordinatable {
     func makeLibrary(parameters: LibraryCoordinator.Parameters) -> LibraryCoordinator {
         LibraryCoordinator(parameters: parameters)
     }
-    
+
     func makeFolderLibrary(parameters: LibraryCoordinator.Parameters) -> LibraryCoordinator {
         LibraryCoordinator(parameters: parameters)
     }

Shared/Extensions/Edge.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

Shared/Extensions/JellyfinAPI/BaseItemDto.swift

@@ -254,14 +254,14 @@ extension BaseItemDto {
     static var noResults: BaseItemDto {
         .init(name: L10n.noResults)
     }
-    
+
     // TODO: remove when `collectionType` becomes an enum
     func includedItemTypesForCollectionType() -> [BaseItemKind]? {
-        
+
         guard let collectionType else { return nil }
-        
+
         var itemTypes: [BaseItemKind]?
-        
+
         switch collectionType {
         case "movies":
             itemTypes = [.movie]
@@ -272,7 +272,7 @@ extension BaseItemDto {
         default:
             itemTypes = nil
         }
-        
+
         return itemTypes
     }
 }

Shared/Extensions/JellyfinAPI/NameGuidPair.swift

@@ -16,9 +16,9 @@ extension NameGuidPair: Displayable {
     }
 }
 
-//extension NameGuidPair: LibraryParent {
+// extension NameGuidPair: LibraryParent {
 //    var libraryType: BaseItemKind? { }
-//}
+// }
 
 extension NameGuidPair {
 

Shared/Extensions/Stateful.swift

@@ -0,0 +1,34 @@
+//
+// Swiftfin is subject to the terms of the Mozilla Public
+// License, v2.0. If a copy of the MPL was not distributed with this
+// file, you can obtain one at https://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
+//
+
+import Foundation
+
+protocol Stateful: AnyObject {
+
+    associatedtype State
+    associatedtype Action
+
+    var state: State { get set }
+
+    /// Send an action to the `Stateful` object, which will
+    /// `respond` to the action and set the new state.
+    @MainActor
+    func send(_ action: Action)
+
+    /// Respond to a sent action and return the new state
+    @MainActor
+    func respond(to action: Action) -> State
+}
+
+extension Stateful {
+
+    @MainActor
+    func send(_ action: Action) {
+        state = respond(to: action)
+    }
+}

Shared/Extensions/Task.swift

@@ -10,7 +10,7 @@ import Combine
 import Foundation
 
 extension Task {
-    
+
     func asAnyCancellable() -> AnyCancellable {
         AnyCancellable(cancel)
     }

Shared/Extensions/UICollectionView.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import UIKit

Shared/Extensions/ViewExtensions/Backport.swift

@@ -3,7 +3,7 @@
 // License, v2.0. If a copy of the MPL was not distributed with this
 // file, you can obtain one at https://mozilla.org/MPL/2.0/.
 //
-// Copyright (c) 2023 Jellyfin & Jellyfin Contributors
+// Copyright (c) 2024 Jellyfin & Jellyfin Contributors
 //
 
 import SwiftUI

Shared/Extensions/ViewExtensions/Modifiers/AfterLastDisappearModifier.swift

@@ -9,12 +9,12 @@
 import SwiftUI
 
 struct AfterLastDisappearModifier: ViewModifier {
-    
+
     @State
     private var lastDisappear: Date? = nil
-    
+
     let action: (TimeInterval) -> Void
-    
+
     func body(content: Content) -> some View {
         content
             .onAppear {

Shared/Extensions/ViewExtensions/Modifiers/OnFinalDisappearModifier.swift

@@ -9,29 +9,29 @@
 import SwiftUI
 
 struct OnFinalDisappearModifier: ViewModifier {
-    
+
     @StateObject
     private var observer: Observer
-    
+
     init(action: @escaping () -> Void) {
         _observer = StateObject(wrappedValue: Observer(action: action))
     }
-    
+
     func body(content: Content) -> some View {
         content
             .background {
                 Color.clear
             }
     }
-    
+
     private class Observer: ObservableObject {
-        
+
         private let action: () -> Void
-        
+
         init(action: @escaping () -> Void) {
             self.action = action
         }
-        
+
         deinit {
             action()
         }

Shared/Extensions/ViewExtensions/Modifiers/OnFirstAppearModifier.swift

@@ -9,12 +9,12 @@
 import SwiftUI
 
 struct OnFirstAppearModifier: ViewModifier {
-    
+
     @State
     private var didAppear = false
-    
+
     let action: () -> Void
-    
+
     func body(content: Content) -> some View {
         content
             .onAppear {

Shared/Extensions/ViewExtensions/ViewExtensions.swift

@@ -53,7 +53,7 @@ extension View {
             transformElse(self)
         }
     }
-    
+
     @ViewBuilder
     @inlinable
     func ifLet<Value, Content: View>(
@@ -237,23 +237,23 @@ extension View {
     var backport: Backport<Self> {
         Backport(content: self)
     }
-    
+
     /// Perform an action on the final disappear of a `View`
     func onFinalDisappear(perform action: @escaping () -> Void) -> some View {
         modifier(OnFinalDisappearModifier(action: action))
     }
-    
+
     /// Perform an action only on the first appearance of a `View`
     func onFirstAppear(perform action: @escaping () -> Void) -> some View {
         modifier(OnFirstAppearModifier(action: action))
     }
-    
+
     /// Perform an action as a view appears which gives a time interval
     /// from when this view last disappeared.
     func afterLastDisappear(perform action: @escaping (TimeInterval) -> Void) -> some View {
         modifier(AfterLastDisappearModifier(action: action))
     }
-    
+
     func topBarTrailing(@ViewBuilder content: @escaping () -> some View) -> some View {
         toolbar {
             ToolbarItemGroup(placement: .topBarTrailing) {

Shared/Objects/LibraryParent.swift

@@ -11,7 +11,7 @@ import JellyfinAPI
 
 protocol LibraryParent: Displayable, Identifiable {
     var id: String? { get }
-    
+
     // Only called `libraryType` because `BaseItemPerson` has
     // a different `type` property. However, people should have
     // different views so this can be renamed when they do, or

Shared/ViewModels/FilterViewModel.swift

@@ -34,7 +34,7 @@ final class FilterViewModel: ViewModel {
         )
         let request = Paths.getQueryFilters(parameters: parameters)
         let response = try? await userSession.client.send(request)
-        
+
         return response?.value.genres?
             .map(\.filter) ?? []
     }

Shared/ViewModels/FoldersViewModel.swift

@@ -13,40 +13,40 @@ import JellyfinAPI
 // is required to handle `collectionFolder` collectionType items,
 // which is changed to a `folder` collectionType for view-handling
 final class FolderViewModel: LibraryViewModel {
-    
+
     override func get(page: Int) async throws -> [BaseItemDto] {
         let parameters = getItemParameters(for: page)
         let request = Paths.getItemsByUserID(userID: userSession.user.id, parameters: parameters)
         let response = try await userSession.client.send(request)
-        
+
         var validItems = (response.value.items ?? []).compactMap { item in
-            
+
             if item.collectionType == "collectionFolder" {
                 var t = item
                 t.collectionType = "folder"
                 return t
             }
-            
+
             return item
         }
-        
+
         return validItems
     }
-    
+
     override func getItemParameters(for page: Int) -> Paths.GetItemsByUserIDParameters {
-        
+
         let filters = filterViewModel.currentFilters
-        
+
         var parameters = Paths.GetItemsByUserIDParameters()
         parameters.parentID = parent?.id
         parameters.fields = ItemFields.minimumCases
         parameters.includeItemTypes = [.movie, .series, .boxSet, .folder, .collectionFolder]
-        
+
         parameters.limit = Self.DefaultPageSize
         parameters.startIndex = page * Self.DefaultPageSize
         parameters.sortOrder = filters.sortOrder.map { SortOrder(rawValue: $0.filterName) ?? .ascending }
         parameters.sortBy = filters.sortBy.map(\.filterName).prepending("IsFolder")
-        
+
         return parameters
     }
 }