diff --git a/Ferrite/ViewModels/PluginManager.swift b/Ferrite/ViewModels/PluginManager.swift index f40e498..664fdb9 100644 --- a/Ferrite/ViewModels/PluginManager.swift +++ b/Ferrite/ViewModels/PluginManager.swift @@ -269,7 +269,7 @@ public class PluginManager: ObservableObject { public func fetchInstalledSources(searchResultsEmpty: Bool) -> [Source] { let backgroundContext = PersistenceController.shared.backgroundContext - if !filteredInstalledSources.isEmpty && !searchResultsEmpty { + if !filteredInstalledSources.isEmpty, !searchResultsEmpty { return Array(filteredInstalledSources) } else if let sources = try? backgroundContext.fetch(Source.fetchRequest()) { return sources.compactMap { $0 } diff --git a/Ferrite/ViewModels/ScrapingViewModel.swift b/Ferrite/ViewModels/ScrapingViewModel.swift index 5c538ab..ab7d9a3 100644 --- a/Ferrite/ViewModels/ScrapingViewModel.swift +++ b/Ferrite/ViewModels/ScrapingViewModel.swift @@ -510,7 +510,7 @@ class ScrapingViewModel: ObservableObject { } // Return if a title doesn't exist - if title == nil && (jsonParser.subResults == nil && existingSearchResult == nil) { + if title == nil, jsonParser.subResults == nil, existingSearchResult == nil { return nil } @@ -531,7 +531,7 @@ class ScrapingViewModel: ObservableObject { // Return if a magnet hash doesn't exist let magnet = Magnet(hash: magnetHash, link: link, title: title, trackers: source.trackers) - if magnet.hash == nil && (jsonParser.subResults == nil && existingSearchResult == nil) { + if magnet.hash == nil, jsonParser.subResults == nil, existingSearchResult == nil { return nil } diff --git a/Ferrite/Views/ComponentViews/Filters/FilterAmountLabelView.swift b/Ferrite/Views/ComponentViews/Filters/FilterAmountLabelView.swift index 0664fc4..f5fd0dc 100644 --- a/Ferrite/Views/ComponentViews/Filters/FilterAmountLabelView.swift +++ b/Ferrite/Views/ComponentViews/Filters/FilterAmountLabelView.swift @@ -8,7 +8,7 @@ import SwiftUI struct FilterAmountLabelView: View { - @Environment (\.colorScheme) var colorScheme + @Environment(\.colorScheme) var colorScheme var amount: Int diff --git a/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift b/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift index a3555fc..2602c68 100644 --- a/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift +++ b/Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift @@ -42,7 +42,7 @@ struct SearchFilterHeaderView: View { } Divider() - .frame(width:2, height: 20) + .frame(width: 2, height: 20) } // MARK: - Source filter picker diff --git a/Ferrite/Views/ComponentViews/SearchResult/SearchResultsView.swift b/Ferrite/Views/ComponentViews/SearchResult/SearchResultsView.swift index 77b748b..0a3ac33 100644 --- a/Ferrite/Views/ComponentViews/SearchResult/SearchResultsView.swift +++ b/Ferrite/Views/ComponentViews/SearchResult/SearchResultsView.swift @@ -24,15 +24,15 @@ struct SearchResultsView: View { ForEach( scrapingModel.searchResults.sorted { navModel.compareSearchResult(lhs: $0, rhs: $1) - } - , id: \.self + }, + id: \.self ) { result in let debridIAStatus = debridManager.matchMagnetHash(result.magnet) if - (pluginManager.filteredInstalledSources.isEmpty || - pluginManager.filteredInstalledSources.contains(where: { result.source == $0.name })) && - (debridManager.filteredIAStatus.isEmpty || - debridManager.filteredIAStatus.contains(debridIAStatus)) + pluginManager.filteredInstalledSources.isEmpty || + pluginManager.filteredInstalledSources.contains(where: { result.source == $0.name }), + debridManager.filteredIAStatus.isEmpty || + debridManager.filteredIAStatus.contains(debridIAStatus) { SearchResultButtonView(result: result) }