From bb481f471e37c06141f6729d498a1fe0163fc16e Mon Sep 17 00:00:00 2001 From: kingbri Date: Fri, 5 Aug 2022 22:32:18 -0400 Subject: [PATCH] Ferrite: Format Signed-off-by: kingbri --- .../Classes/Source+CoreDataProperties.swift | 35 ++++++-------- .../SourceHtmlParser+CoreDataProperties.swift | 44 ++++++++--------- .../SourceRssParser+CoreDataClass.swift | 6 +-- .../SourceRssParser+CoreDataProperties.swift | 47 +++++++++---------- .../Classes/SourceTracker+CoreDataClass.swift | 6 +-- .../SourceTracker+CoreDataProperties.swift | 21 ++++----- Ferrite/ViewModels/ScrapingViewModel.swift | 4 +- Ferrite/ViewModels/SourceManager.swift | 2 +- .../Views/SourceViews/SourceCatalogView.swift | 2 +- .../SourceViews/SourceSettingsView.swift | 2 +- .../SourceViews/SourceUpdateButtonView.swift | 2 +- Ferrite/Views/SourcesView.swift | 8 ++-- 12 files changed, 77 insertions(+), 102 deletions(-) diff --git a/Ferrite/DataManagement/Classes/Source+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/Source+CoreDataProperties.swift index 42ef1f8..2be1c40 100644 --- a/Ferrite/DataManagement/Classes/Source+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/Source+CoreDataProperties.swift @@ -6,29 +6,24 @@ // // -import Foundation import CoreData +import Foundation - -extension Source { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "Source") +public extension Source { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "Source") } - @NSManaged public var id: UUID - @NSManaged public var baseUrl: String - @NSManaged public var enabled: Bool - @NSManaged public var name: String - @NSManaged public var author: String - @NSManaged public var listId: UUID? - @NSManaged public var preferredParser: Int16 - @NSManaged public var version: Int16 - @NSManaged public var htmlParser: SourceHtmlParser? - @NSManaged public var rssParser: SourceRssParser? - + @NSManaged var id: UUID + @NSManaged var baseUrl: String + @NSManaged var enabled: Bool + @NSManaged var name: String + @NSManaged var author: String + @NSManaged var listId: UUID? + @NSManaged var preferredParser: Int16 + @NSManaged var version: Int16 + @NSManaged var htmlParser: SourceHtmlParser? + @NSManaged var rssParser: SourceRssParser? } -extension Source : Identifiable { - -} +extension Source: Identifiable {} diff --git a/Ferrite/DataManagement/Classes/SourceHtmlParser+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/SourceHtmlParser+CoreDataProperties.swift index 0b1de8f..efaf149 100644 --- a/Ferrite/DataManagement/Classes/SourceHtmlParser+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/SourceHtmlParser+CoreDataProperties.swift @@ -6,45 +6,39 @@ // // -import Foundation import CoreData +import Foundation - -extension SourceHtmlParser { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "SourceHtmlParser") +public extension SourceHtmlParser { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "SourceHtmlParser") } - @NSManaged public var rows: String - @NSManaged public var searchUrl: String - @NSManaged public var magnetLink: SourceMagnetLink? - @NSManaged public var parentSource: Source? - @NSManaged public var seedLeech: SourceSeedLeech? - @NSManaged public var size: SourceSize? - @NSManaged public var title: SourceTitle? - @NSManaged public var magnetHash: SourceMagnetHash? - @NSManaged public var trackers: NSSet? - + @NSManaged var rows: String + @NSManaged var searchUrl: String + @NSManaged var magnetLink: SourceMagnetLink? + @NSManaged var parentSource: Source? + @NSManaged var seedLeech: SourceSeedLeech? + @NSManaged var size: SourceSize? + @NSManaged var title: SourceTitle? + @NSManaged var magnetHash: SourceMagnetHash? + @NSManaged var trackers: NSSet? } // MARK: Generated accessors for trackers -extension SourceHtmlParser { +public extension SourceHtmlParser { @objc(addTrackersObject:) - @NSManaged public func addToTrackers(_ value: SourceTracker) + @NSManaged func addToTrackers(_ value: SourceTracker) @objc(removeTrackersObject:) - @NSManaged public func removeFromTrackers(_ value: SourceTracker) + @NSManaged func removeFromTrackers(_ value: SourceTracker) @objc(addTrackers:) - @NSManaged public func addToTrackers(_ values: NSSet) + @NSManaged func addToTrackers(_ values: NSSet) @objc(removeTrackers:) - @NSManaged public func removeFromTrackers(_ values: NSSet) - + @NSManaged func removeFromTrackers(_ values: NSSet) } -extension SourceHtmlParser : Identifiable { - -} +extension SourceHtmlParser: Identifiable {} diff --git a/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataClass.swift b/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataClass.swift index 1fda4d9..833d613 100644 --- a/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataClass.swift +++ b/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataClass.swift @@ -6,10 +6,8 @@ // // -import Foundation import CoreData +import Foundation @objc(SourceRssParser) -public class SourceRssParser: NSManagedObject { - -} +public class SourceRssParser: NSManagedObject {} diff --git a/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataProperties.swift index 1b36d5e..6f8e9be 100644 --- a/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/SourceRssParser+CoreDataProperties.swift @@ -6,28 +6,26 @@ // // -import Foundation import CoreData +import Foundation - -extension SourceRssParser { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "SourceRssParser") +public extension SourceRssParser { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "SourceRssParser") } - @NSManaged public var items: String - @NSManaged public var searchUrl: String - @NSManaged public var rssUrl: String? - @NSManaged public var parentSource: Source? - @NSManaged public var trackers: NSSet? - @NSManaged public var magnetLink: SourceMagnetLink? - @NSManaged public var size: SourceSize? - @NSManaged public var title: SourceTitle? - @NSManaged public var seedLeech: SourceSeedLeech? - @NSManaged public var magnetHash: SourceMagnetHash? + @NSManaged var items: String + @NSManaged var searchUrl: String + @NSManaged var rssUrl: String? + @NSManaged var parentSource: Source? + @NSManaged var trackers: NSSet? + @NSManaged var magnetLink: SourceMagnetLink? + @NSManaged var size: SourceSize? + @NSManaged var title: SourceTitle? + @NSManaged var seedLeech: SourceSeedLeech? + @NSManaged var magnetHash: SourceMagnetHash? - var trackerArray: [SourceTracker] { + internal var trackerArray: [SourceTracker] { let trackerSet = trackers as? Set ?? [] return trackerSet.map { $0 } @@ -35,22 +33,19 @@ extension SourceRssParser { } // MARK: Generated accessors for trackers -extension SourceRssParser { +public extension SourceRssParser { @objc(addTrackersObject:) - @NSManaged public func addToTrackers(_ value: SourceTracker) + @NSManaged func addToTrackers(_ value: SourceTracker) @objc(removeTrackersObject:) - @NSManaged public func removeFromTrackers(_ value: SourceTracker) + @NSManaged func removeFromTrackers(_ value: SourceTracker) @objc(addTrackers:) - @NSManaged public func addToTrackers(_ values: NSSet) + @NSManaged func addToTrackers(_ values: NSSet) @objc(removeTrackers:) - @NSManaged public func removeFromTrackers(_ values: NSSet) - + @NSManaged func removeFromTrackers(_ values: NSSet) } -extension SourceRssParser : Identifiable { - -} +extension SourceRssParser: Identifiable {} diff --git a/Ferrite/DataManagement/Classes/SourceTracker+CoreDataClass.swift b/Ferrite/DataManagement/Classes/SourceTracker+CoreDataClass.swift index 8fc0067..a4ee470 100644 --- a/Ferrite/DataManagement/Classes/SourceTracker+CoreDataClass.swift +++ b/Ferrite/DataManagement/Classes/SourceTracker+CoreDataClass.swift @@ -6,10 +6,8 @@ // // -import Foundation import CoreData +import Foundation @objc(SourceTracker) -public class SourceTracker: NSManagedObject { - -} +public class SourceTracker: NSManagedObject {} diff --git a/Ferrite/DataManagement/Classes/SourceTracker+CoreDataProperties.swift b/Ferrite/DataManagement/Classes/SourceTracker+CoreDataProperties.swift index 6b819db..85f7ccf 100644 --- a/Ferrite/DataManagement/Classes/SourceTracker+CoreDataProperties.swift +++ b/Ferrite/DataManagement/Classes/SourceTracker+CoreDataProperties.swift @@ -6,22 +6,17 @@ // // -import Foundation import CoreData +import Foundation - -extension SourceTracker { - - @nonobjc public class func fetchRequest() -> NSFetchRequest { - return NSFetchRequest(entityName: "SourceTracker") +public extension SourceTracker { + @nonobjc class func fetchRequest() -> NSFetchRequest { + NSFetchRequest(entityName: "SourceTracker") } - @NSManaged public var urlString: String - @NSManaged public var parentRssParser: SourceRssParser? - @NSManaged public var parentHtmlParser: SourceHtmlParser? - + @NSManaged var urlString: String + @NSManaged var parentRssParser: SourceRssParser? + @NSManaged var parentHtmlParser: SourceHtmlParser? } -extension SourceTracker : Identifiable { - -} +extension SourceTracker: Identifiable {} diff --git a/Ferrite/ViewModels/ScrapingViewModel.swift b/Ferrite/ViewModels/ScrapingViewModel.swift index b7742d4..1406f86 100644 --- a/Ferrite/ViewModels/ScrapingViewModel.swift +++ b/Ferrite/ViewModels/ScrapingViewModel.swift @@ -496,7 +496,7 @@ class ScrapingViewModel: ObservableObject { } public func generateMagnetLink(magnetHash: String, title: String?, trackers: [SourceTracker]) -> String { - var magnetLinkArray: [String] = ["magnet:?xt=urn:btih:"] + var magnetLinkArray = ["magnet:?xt=urn:btih:"] magnetLinkArray.append(magnetHash) @@ -506,7 +506,7 @@ class ScrapingViewModel: ObservableObject { for tracker in trackers { if URL(string: tracker.urlString) != nil, - let encodedUrlString = tracker.urlString.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) + let encodedUrlString = tracker.urlString.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) { magnetLinkArray.append("&tr=\(encodedUrlString)") } diff --git a/Ferrite/ViewModels/SourceManager.swift b/Ferrite/ViewModels/SourceManager.swift index 5c7de64..5f18c6f 100644 --- a/Ferrite/ViewModels/SourceManager.swift +++ b/Ferrite/ViewModels/SourceManager.swift @@ -242,7 +242,7 @@ public class SourceManager: ObservableObject { let sourceListRequest = SourceList.fetchRequest() let urlPredicate = NSPredicate(format: "urlString == %@", sourceUrl) let infoPredicate = NSPredicate(format: "author == %@ AND name == %@", rawResponse.author, rawResponse.name) - sourceListRequest.predicate = NSCompoundPredicate.init(type: .or, subpredicates: [urlPredicate, infoPredicate]) + sourceListRequest.predicate = NSCompoundPredicate(type: .or, subpredicates: [urlPredicate, infoPredicate]) sourceListRequest.fetchLimit = 1 if (try? backgroundContext.fetch(sourceListRequest).first) != nil { diff --git a/Ferrite/Views/SourceViews/SourceCatalogView.swift b/Ferrite/Views/SourceViews/SourceCatalogView.swift index 1ebbfe5..295a19c 100644 --- a/Ferrite/Views/SourceViews/SourceCatalogView.swift +++ b/Ferrite/Views/SourceViews/SourceCatalogView.swift @@ -20,7 +20,7 @@ struct SourceCatalogButtonView: View { Text("v\(availableSource.version)") .foregroundColor(.secondary) } - + Text("by \(availableSource.author ?? "Unknown")") .foregroundColor(.secondary) } diff --git a/Ferrite/Views/SourceViews/SourceSettingsView.swift b/Ferrite/Views/SourceViews/SourceSettingsView.swift index 78a1f7b..8617b96 100644 --- a/Ferrite/Views/SourceViews/SourceSettingsView.swift +++ b/Ferrite/Views/SourceViews/SourceSettingsView.swift @@ -78,7 +78,7 @@ struct SourceSettingsMethodView: View { .onAppear { selectedTempParser = SourcePreferredParser(rawValue: selectedSource.preferredParser) ?? .none } - .onChange(of: selectedTempParser) { newMethod in + .onChange(of: selectedTempParser) { _ in selectedSource.preferredParser = selectedTempParser.rawValue PersistenceController.shared.save() } diff --git a/Ferrite/Views/SourceViews/SourceUpdateButtonView.swift b/Ferrite/Views/SourceViews/SourceUpdateButtonView.swift index 9db6c0d..6310f0e 100644 --- a/Ferrite/Views/SourceViews/SourceUpdateButtonView.swift +++ b/Ferrite/Views/SourceViews/SourceUpdateButtonView.swift @@ -20,7 +20,7 @@ struct SourceUpdateButtonView: View { Text("v\(updatedSource.version)") .foregroundColor(.secondary) } - + Text("by \(updatedSource.author ?? "Unknown")") .foregroundColor(.secondary) } diff --git a/Ferrite/Views/SourcesView.swift b/Ferrite/Views/SourcesView.swift index 2f6218d..10f08a1 100644 --- a/Ferrite/Views/SourcesView.swift +++ b/Ferrite/Views/SourcesView.swift @@ -62,8 +62,8 @@ struct SourcesView: View { !sources.contains( where: { availableSource.name == $0.name && - availableSource.listId == $0.listId && - availableSource.author == $0.author + availableSource.listId == $0.listId && + availableSource.author == $0.author } ) }) { @@ -72,8 +72,8 @@ struct SourcesView: View { if !sources.contains( where: { availableSource.name == $0.name && - availableSource.listId == $0.listId && - availableSource.author == $0.author + availableSource.listId == $0.listId && + availableSource.author == $0.author } ) { SourceCatalogButtonView(availableSource: availableSource)