Creepso/Ferrite-backup
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 15 Packages Wiki Activity Actions

Sources: Migrate source list addition to ViewModel

Browse source 
I was accidentally calling dismiss on failure which dismisses the
alert and breaks how presentation is handled on sheets.

Signed-off-by: kingbri <bdashore3@gmail.com>
This commit is contained in:
kingbri 2022-07-26 13:28:34 -04:00
parent 9d5a0d0120
commit 88162814d5
2 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Ferrite/ViewModels/SourceManager.swift
View file

@ -12,6 +12,9 @@ public class SourceManager: ObservableObject {
@Published var availableSources: [TorrentSourceJson] = []
@Published var urlErrorAlertText = ""
@Published var showUrlErrorAlert = false
@MainActor
public func fetchSourcesFromUrl() async {
let sourceUrlRequest = TorrentSourceUrl.fetchRequest()
@ -73,4 +76,44 @@ public class SourceManager: ObservableObject {
}
}
}
@MainActor
public func addSourceList(sourceUrl: String) async -> Bool {
let backgroundContext = PersistenceController.shared.backgroundContext
if sourceUrl.isEmpty || URL(string: sourceUrl) == nil {
urlErrorAlertText = "The provided source list is invalid. Please check if the URL is formatted properly."
showUrlErrorAlert.toggle()
return false
}
let sourceUrlRequest = TorrentSourceUrl.fetchRequest()
sourceUrlRequest.predicate = NSPredicate(format: "urlString == %@", sourceUrl)
sourceUrlRequest.fetchLimit = 1
if let existingSourceUrl = try? backgroundContext.fetch(sourceUrlRequest).first {
print("Existing source URL found")
PersistenceController.shared.delete(existingSourceUrl, context: backgroundContext)
}
let newSourceUrl = TorrentSourceUrl(context: backgroundContext)
newSourceUrl.urlString = sourceUrl
do {
let (data, _) = try await URLSession.shared.data(for: URLRequest(url: URL(string: sourceUrl)!))
if let rawResponse = try? JSONDecoder().decode(SourceJson.self, from: data) {
newSourceUrl.repoName = rawResponse.repoName
}
try backgroundContext.save()
return true
} catch {
urlErrorAlertText = error.localizedDescription
showUrlErrorAlert.toggle()
return false
}
}
}

42
Ferrite/Views/SettingsViews/SourceListEditorView.swift
View file

@ -15,8 +15,6 @@ struct SourceListEditorView: View {
let backgroundContext = PersistenceController.shared.backgroundContext
@State private var sourceUrl = ""
@State private var urlErrorAlertText = ""
@State private var showUrlErrorAlert = false
var body: some View {
NavView {
@ -28,10 +26,10 @@ struct SourceListEditorView: View {
.autocapitalization(.none)
}
}
.alert(isPresented: $showUrlErrorAlert) {
.alert(isPresented: $sourceManager.showUrlErrorAlert) {
Alert(
title: Text("Error"),
message: Text(urlErrorAlertText),
message: Text(sourceManager.urlErrorAlertText),
dismissButton: .default(Text("OK"))
)
}
@ -44,44 +42,12 @@ struct SourceListEditorView: View {
}
}
// Placing this function in the SourceManager causes the view to break on error. Place it here for now.
ToolbarItem(placement: .navigationBarTrailing) {
Button("Save") {
Task {
let backgroundContext = PersistenceController.shared.backgroundContext
if sourceUrl.isEmpty || URL(string: sourceUrl) == nil {
urlErrorAlertText = "The provided source list is invalid. Please check if the URL is formatted properly."
showUrlErrorAlert.toggle()
return
if await sourceManager.addSourceList(sourceUrl: sourceUrl) {
dismiss()
}
let sourceUrlRequest = TorrentSourceUrl.fetchRequest()
sourceUrlRequest.predicate = NSPredicate(format: "urlString == %@", sourceUrl)
sourceUrlRequest.fetchLimit = 1
if let existingSourceUrl = try? backgroundContext.fetch(sourceUrlRequest).first {
print("Existing source URL found")
PersistenceController.shared.delete(existingSourceUrl, context: backgroundContext)
}
let newSourceUrl = TorrentSourceUrl(context: backgroundContext)
newSourceUrl.urlString = sourceUrl
do {
let (data, _) = try await URLSession.shared.data(for: URLRequest(url: URL(string: sourceUrl)!))
if let rawResponse = try? JSONDecoder().decode(SourceJson.self, from: data) {
newSourceUrl.repoName = rawResponse.repoName
}
try backgroundContext.save()
} catch {
urlErrorAlertText = error.localizedDescription
showUrlErrorAlert.toggle()
}
dismiss()
}
}
}