From 9d5a0d012095bf4702d3c16852d1dfba571eb931 Mon Sep 17 00:00:00 2001 From: kingbri Date: Tue, 26 Jul 2022 11:07:01 -0400 Subject: [PATCH] Ferrite: Format Signed-off-by: kingbri --- Ferrite/API/RealDebridWrapper.swift | 2 +- .../Classes/TorrentSource+CoreDataClass.swift | 6 ++-- .../TorrentSource+CoreDataProperties.swift | 29 ++++++++----------- .../TorrentSourceUrl+CoreDataClass.swift | 6 ++-- .../TorrentSourceUrl+CoreDataProperties.swift | 21 +++++--------- Ferrite/Models/SourceModels.swift | 2 +- Ferrite/ViewModels/SourceManager.swift | 2 +- Ferrite/Views/ContentView.swift | 6 ++-- Ferrite/Views/SearchResultsView.swift | 2 +- Ferrite/Views/SourceListView.swift | 9 +++--- 10 files changed, 35 insertions(+), 50 deletions(-) diff --git a/Ferrite/API/RealDebridWrapper.swift b/Ferrite/API/RealDebridWrapper.swift index fa0c90d..e72b2b5 100644 --- a/Ferrite/API/RealDebridWrapper.swift +++ b/Ferrite/API/RealDebridWrapper.swift @@ -146,7 +146,7 @@ public class RealDebrid: ObservableObject { keychain.set(rawResponse.accessToken, forKey: "RealDebrid.AccessToken") keychain.set(rawResponse.refreshToken, forKey: "RealDebrid.RefreshToken") - let accessTimestamp = Date().timeIntervalSince1970 + (Double(rawResponse.expiresIn)) + let accessTimestamp = Date().timeIntervalSince1970 + Double(rawResponse.expiresIn) UserDefaults.standard.set(accessTimestamp, forKey: "RealDebrid.AccessTokenStamp") // Set AppStorage variable diff --git a/Ferrite/DataManagement/Classes/TorrentSource+CoreDataClass.swift b/Ferrite/DataManagement/Classes/TorrentSource+CoreDataClass.swift index 1f9ee6d..bc789b4 100644 --- a/Ferrite/DataManagement/Classes/TorrentSource+CoreDataClass.swift +++ b/Ferrite/DataManagement/Classes/TorrentSource+CoreDataClass.swift @@ -6,10 +6,8 @@ // // -import Foundation import CoreData +import Foundation @objc(TorrentSource) -public class TorrentSource: NSManagedObject { - -} +public class TorrentSource: NSManagedObject {} diff --git a/Ferrite/DataManagement/Classes/TorrentSource+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/TorrentSource+CoreDataProperties.swift index 7bdf37b..9040ec7 100644 --- a/Ferrite/DataManagement/Classes/TorrentSource+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/TorrentSource+CoreDataProperties.swift @@ -6,26 +6,21 @@ // // -import Foundation import CoreData +import Foundation - -extension TorrentSource { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "TorrentSource") +public extension TorrentSource { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "TorrentSource") } - @NSManaged public var enabled: Bool - @NSManaged public var linkQuery: String - @NSManaged public var name: String? - @NSManaged public var rowQuery: String - @NSManaged public var sizeQuery: String? - @NSManaged public var titleQuery: String? - @NSManaged public var url: String - + @NSManaged var enabled: Bool + @NSManaged var linkQuery: String + @NSManaged var name: String? + @NSManaged var rowQuery: String + @NSManaged var sizeQuery: String? + @NSManaged var titleQuery: String? + @NSManaged var url: String } -extension TorrentSource : Identifiable { - -} +extension TorrentSource: Identifiable {} diff --git a/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataClass.swift b/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataClass.swift index 0f715ec..f6ec04c 100644 --- a/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataClass.swift +++ b/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataClass.swift @@ -6,10 +6,8 @@ // // -import Foundation import CoreData +import Foundation @objc(TorrentSourceUrl) -public class TorrentSourceUrl: NSManagedObject { - -} +public class TorrentSourceUrl: NSManagedObject {} diff --git a/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataProperties.swift index 8c92975..265ce24 100644 --- a/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/TorrentSourceUrl+CoreDataProperties.swift @@ -6,22 +6,17 @@ // // -import Foundation import CoreData +import Foundation - -extension TorrentSourceUrl { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "TorrentSourceUrl") +public extension TorrentSourceUrl { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "TorrentSourceUrl") } - @NSManaged public var urlString: String - @NSManaged public var repoName: String? - @NSManaged public var repoAuthor: String? - + @NSManaged var urlString: String + @NSManaged var repoName: String? + @NSManaged var repoAuthor: String? } -extension TorrentSourceUrl : Identifiable { - -} +extension TorrentSourceUrl: Identifiable {} diff --git a/Ferrite/Models/SourceModels.swift b/Ferrite/Models/SourceModels.swift index 964b361..6110ec4 100644 --- a/Ferrite/Models/SourceModels.swift +++ b/Ferrite/Models/SourceModels.swift @@ -15,7 +15,7 @@ public struct SourceJson: Codable { enum CodingKeys: String, CodingKey { case repoName = "name" case repoAuthor = "author" - case sources = "sources" + case sources } } diff --git a/Ferrite/ViewModels/SourceManager.swift b/Ferrite/ViewModels/SourceManager.swift index 8a139b8..1e62972 100644 --- a/Ferrite/ViewModels/SourceManager.swift +++ b/Ferrite/ViewModels/SourceManager.swift @@ -68,7 +68,7 @@ public class SourceManager: ObservableObject { do { try backgroundContext.save() } catch { - Task{ @MainActor in + Task { @MainActor in toastModel?.toastDescription = error.localizedDescription } } diff --git a/Ferrite/Views/ContentView.swift b/Ferrite/Views/ContentView.swift index 9a173fb..ff31d6e 100644 --- a/Ferrite/Views/ContentView.swift +++ b/Ferrite/Views/ContentView.swift @@ -37,7 +37,7 @@ struct ContentView: View { } label: { Text("None") - if (selectedSource == nil) { + if selectedSource == nil { Image(systemName: "checkmark") } } @@ -79,9 +79,7 @@ struct ContentView: View { } } - func performSearch() { - - } + func performSearch() {} } struct ContentView_Previews: PreviewProvider { diff --git a/Ferrite/Views/SearchResultsView.swift b/Ferrite/Views/SearchResultsView.swift index 720860e..a7dfec4 100644 --- a/Ferrite/Views/SearchResultsView.swift +++ b/Ferrite/Views/SearchResultsView.swift @@ -52,7 +52,7 @@ struct SearchResultsView: View { } .tint(.primary) .padding(.bottom, 5) - + SearchResultRDView(result: result) } } diff --git a/Ferrite/Views/SourceListView.swift b/Ferrite/Views/SourceListView.swift index 5feeca0..bd7b1d9 100644 --- a/Ferrite/Views/SourceListView.swift +++ b/Ferrite/Views/SourceListView.swift @@ -30,8 +30,9 @@ struct SourceListView: View { set: { source.enabled = $0 PersistenceController.shared.save() - })) { - Text(source.name ?? "Unknown Source") + } + )) { + Text(source.name ?? "Unknown Source") } } .onDelete { offsets in @@ -52,9 +53,9 @@ struct SourceListView: View { if !sources.contains(where: { availableSource.name == $0.name }) { HStack { Text(availableSource.name ?? "Unnamed source") - + Spacer() - + Button("Install") { sourceManager.installSource(sourceJson: availableSource) }