From 3c6ce0bb94f1c02059e7bc2d871269eeccd3dc89 Mon Sep 17 00:00:00 2001 From: kingbri Date: Mon, 15 Aug 2022 20:55:16 -0400 Subject: [PATCH] Debrid: Don't show sheet on error If a download link isn't set, don't show the choice sheet and present the error instead. Signed-off-by: kingbri --- Ferrite/Views/BatchChoiceView.swift | 8 +++++--- Ferrite/Views/MainView.swift | 1 + Ferrite/Views/SearchResultsView.swift | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Ferrite/Views/BatchChoiceView.swift b/Ferrite/Views/BatchChoiceView.swift index 3d97be7..a251ce8 100644 --- a/Ferrite/Views/BatchChoiceView.swift +++ b/Ferrite/Views/BatchChoiceView.swift @@ -25,9 +25,11 @@ struct BatchChoiceView: View { Task { await debridManager.fetchRdDownload(searchResult: searchResult, iaFile: file) - // The download may complete before this sheet dismisses - try? await Task.sleep(seconds: 1) - navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl) + if !debridManager.realDebridDownloadUrl.isEmpty { + // The download may complete before this sheet dismisses + try? await Task.sleep(seconds: 1) + navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl) + } debridManager.selectedRealDebridFile = nil debridManager.selectedRealDebridItem = nil diff --git a/Ferrite/Views/MainView.swift b/Ferrite/Views/MainView.swift index e3b1c17..d04d0be 100644 --- a/Ferrite/Views/MainView.swift +++ b/Ferrite/Views/MainView.swift @@ -51,6 +51,7 @@ struct MainView: View { } } .font(.caption) + .shadow(radius: 10) .animation(.easeInOut(duration: 0.3), value: toastModel.showToast) } } diff --git a/Ferrite/Views/SearchResultsView.swift b/Ferrite/Views/SearchResultsView.swift index 913d01e..5ded689 100644 --- a/Ferrite/Views/SearchResultsView.swift +++ b/Ferrite/Views/SearchResultsView.swift @@ -26,7 +26,10 @@ struct SearchResultsView: View { case .full: Task { await debridManager.fetchRdDownload(searchResult: result) - navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl) + + if !debridManager.realDebridDownloadUrl.isEmpty { + navModel.runDebridAction(action: nil, urlString: debridManager.realDebridDownloadUrl) + } } case .partial: if debridManager.setSelectedRdResult(result: result) {