Creepso/Ferrite
1
0
Fork 0
mirror of https://github.com/Ferrite-iOS/Ferrite.git synced 2026-04-21 00:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ferrite: Format

Browse source 
Signed-off-by: kingbri <bdashore3@proton.me>
This commit is contained in:
kingbri 2023-04-23 15:24:29 -04:00
parent 76a0262a14
commit 9e362c14b7
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ferrite/ViewModels/PluginManager.swift
View file

@ -269,7 +269,7 @@ public class PluginManager: ObservableObject {
public func fetchInstalledSources(searchResultsEmpty: Bool) -> [Source] { public func fetchInstalledSources(searchResultsEmpty: Bool) -> [Source] {
let backgroundContext = PersistenceController.shared.backgroundContext let backgroundContext = PersistenceController.shared.backgroundContext
if !filteredInstalledSources.isEmpty && !searchResultsEmpty { if !filteredInstalledSources.isEmpty, !searchResultsEmpty {
return Array(filteredInstalledSources) return Array(filteredInstalledSources)
} else if let sources = try? backgroundContext.fetch(Source.fetchRequest()) { } else if let sources = try? backgroundContext.fetch(Source.fetchRequest()) {
return sources.compactMap { $0 } return sources.compactMap { $0 }

4
Ferrite/ViewModels/ScrapingViewModel.swift
View file

@ -510,7 +510,7 @@ class ScrapingViewModel: ObservableObject {
} }
// Return if a title doesn't exist // 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 return nil
} }
@ -531,7 +531,7 @@ class ScrapingViewModel: ObservableObject {
// Return if a magnet hash doesn't exist // Return if a magnet hash doesn't exist
let magnet = Magnet(hash: magnetHash, link: link, title: title, trackers: source.trackers) 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 return nil
} }

2
Ferrite/Views/ComponentViews/Filters/FilterAmountLabelView.swift
View file

@ -8,7 +8,7 @@
import SwiftUI import SwiftUI
struct FilterAmountLabelView: View { struct FilterAmountLabelView: View {
@Environment (\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
var amount: Int var amount: Int

2
Ferrite/Views/ComponentViews/SearchResult/SearchFilterHeaderView.swift
View file

@ -42,7 +42,7 @@ struct SearchFilterHeaderView: View {
} }
Divider() Divider()
.frame(width:2, height: 20) .frame(width: 2, height: 20)
} }
// MARK: - Source filter picker // MARK: - Source filter picker

12
Ferrite/Views/ComponentViews/SearchResult/SearchResultsView.swift
View file

@ -24,15 +24,15 @@ struct SearchResultsView: View {
ForEach( ForEach(
scrapingModel.searchResults.sorted { scrapingModel.searchResults.sorted {
navModel.compareSearchResult(lhs: $0, rhs: $1) navModel.compareSearchResult(lhs: $0, rhs: $1)
} },
, id: \.self id: \.self
) { result in ) { result in
let debridIAStatus = debridManager.matchMagnetHash(result.magnet) let debridIAStatus = debridManager.matchMagnetHash(result.magnet)
if if
(pluginManager.filteredInstalledSources.isEmpty || pluginManager.filteredInstalledSources.isEmpty ||
pluginManager.filteredInstalledSources.contains(where: { result.source == $0.name })) && pluginManager.filteredInstalledSources.contains(where: { result.source == $0.name }),
(debridManager.filteredIAStatus.isEmpty || debridManager.filteredIAStatus.isEmpty ||
debridManager.filteredIAStatus.contains(debridIAStatus)) debridManager.filteredIAStatus.contains(debridIAStatus)
{ {
SearchResultButtonView(result: result) SearchResultButtonView(result: result)
} }