Tree: Format

Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2024-06-08 12:27:36 -04:00
parent 973fbb4099
commit 6192ef1ede
6 changed files with 32 additions and 34 deletions

View file

@ -13,7 +13,7 @@ public class Premiumize: OAuthDebridSource, ObservableObject {
public let website = "https://premiumize.me" public let website = "https://premiumize.me"
@Published public var authProcessing: Bool = false @Published public var authProcessing: Bool = false
public var isLoggedIn: Bool { public var isLoggedIn: Bool {
return getToken() != nil getToken() != nil
} }
public var manualToken: String? { public var manualToken: String? {

View file

@ -12,8 +12,8 @@
// TODO: Replace with Observable when minVersion >= iOS 17 // TODO: Replace with Observable when minVersion >= iOS 17
// //
import SwiftUI
import Combine import Combine
import SwiftUI
class ErasedObservableObject: ObservableObject { class ErasedObservableObject: ObservableObject {
let objectWillChange: AnyPublisher<Void, Never> let objectWillChange: AnyPublisher<Void, Never>
@ -67,7 +67,7 @@ public struct Store<ObjectType> {
fileprivate var _observableObject: ObservedObject<ErasedObservableObject> fileprivate var _observableObject: ObservedObject<ErasedObservableObject>
@MainActor internal var observableObject: ErasedObservableObject { @MainActor internal var observableObject: ErasedObservableObject {
return _observableObject.wrappedValue _observableObject.wrappedValue
} }
/// A projected value which has the same properties as the wrapped value, but presented as /// A projected value which has the same properties as the wrapped value, but presented as
@ -84,29 +84,28 @@ public struct Store<ObjectType> {
/// } /// }
/// ``` /// ```
public var projectedValue: Wrapper { public var projectedValue: Wrapper {
return Wrapper(self) Wrapper(self)
} }
/// Create a stored value on a custom scheduler. /// Create a stored value on a custom scheduler.
/// ///
/// Use this init to schedule updates on a specific scheduler other than `DispatchQueue.main`. /// Use this init to schedule updates on a specific scheduler other than `DispatchQueue.main`.
public init<S: Scheduler>( public init<S: Scheduler>(wrappedValue: ObjectType,
wrappedValue: ObjectType,
on scheduler: S, on scheduler: S,
schedulerOptions: S.SchedulerOptions? = nil schedulerOptions: S.SchedulerOptions? = nil)
) { {
self.wrappedValue = wrappedValue self.wrappedValue = wrappedValue
if let observable = wrappedValue as? AnyObservableObject { if let observable = wrappedValue as? AnyObservableObject {
let objectWillChange = observable.objectWillChange let objectWillChange = observable.objectWillChange
.receive(on: scheduler, options: schedulerOptions) .receive(on: scheduler, options: schedulerOptions)
.eraseToAnyPublisher() .eraseToAnyPublisher()
self._observableObject = .init(initialValue: .init(objectWillChange: objectWillChange)) _observableObject = .init(initialValue: .init(objectWillChange: objectWillChange))
} else { } else {
assertionFailure( assertionFailure(
"Only use the Store property wrapper with objects conforming to AnyObservableObject." "Only use the Store property wrapper with objects conforming to AnyObservableObject."
) )
self._observableObject = .init(initialValue: .empty()) _observableObject = .init(initialValue: .empty())
} }
} }
@ -132,7 +131,7 @@ public struct Store<ObjectType> {
public subscript<Subject>( public subscript<Subject>(
dynamicMember keyPath: ReferenceWritableKeyPath<ObjectType, Subject> dynamicMember keyPath: ReferenceWritableKeyPath<ObjectType, Subject>
) -> Binding<Subject> { ) -> Binding<Subject> {
return Binding { Binding {
self.store.wrappedValue[keyPath: keyPath] self.store.wrappedValue[keyPath: keyPath]
} set: { } set: {
self.store.wrappedValue[keyPath: keyPath] = $0 self.store.wrappedValue[keyPath: keyPath] = $0

View file

@ -27,7 +27,7 @@ public class DebridManager: ObservableObject {
} }
var enabledDebridCount: Int { var enabledDebridCount: Int {
debridSources.filter{ $0.isLoggedIn }.count debridSources.filter(\.isLoggedIn).count
} }
@Published var selectedDebridSource: DebridSource? { @Published var selectedDebridSource: DebridSource? {
@ -35,6 +35,7 @@ public class DebridManager: ObservableObject {
UserDefaults.standard.set(selectedDebridSource?.id ?? "", forKey: "Debrid.PreferredService") UserDefaults.standard.set(selectedDebridSource?.id ?? "", forKey: "Debrid.PreferredService")
} }
} }
var selectedDebridItem: DebridIA? var selectedDebridItem: DebridIA?
var selectedDebridFile: DebridIAFile? var selectedDebridFile: DebridIAFile?
@ -59,7 +60,6 @@ public class DebridManager: ObservableObject {
var premiumizeAuthProcessing: Bool = false var premiumizeAuthProcessing: Bool = false
init() { init() {
// Set the preferred service. Contains migration logic for earlier versions // Set the preferred service. Contains migration logic for earlier versions
if let rawPreferredService = UserDefaults.standard.string(forKey: "Debrid.PreferredService") { if let rawPreferredService = UserDefaults.standard.string(forKey: "Debrid.PreferredService") {
let debridServiceId: String? let debridServiceId: String?
@ -72,8 +72,8 @@ public class DebridManager: ObservableObject {
// Only set the debrid source if it's logged in // Only set the debrid source if it's logged in
// Otherwise remove the key // Otherwise remove the key
let tempDebridSource = self.debridSources.first { $0.id == debridServiceId } let tempDebridSource = debridSources.first { $0.id == debridServiceId }
if (tempDebridSource?.isLoggedIn ?? false) { if tempDebridSource?.isLoggedIn ?? false {
selectedDebridSource = tempDebridSource selectedDebridSource = tempDebridSource
} else { } else {
UserDefaults.standard.removeObject(forKey: "Debrid.PreferredService") UserDefaults.standard.removeObject(forKey: "Debrid.PreferredService")
@ -377,7 +377,6 @@ public class DebridManager: ObservableObject {
if error.code != -999 { if error.code != -999 {
await sendDebridError(error, prefix: "\(selectedSource.id) cloud fetch error") await sendDebridError(error, prefix: "\(selectedSource.id) cloud fetch error")
} }
} }
} }
} }