From dd54ec027bcb753ec2d91b697bdf3916770b674f Mon Sep 17 00:00:00 2001 From: kingbri Date: Tue, 26 Nov 2024 23:43:06 -0500 Subject: [PATCH] Tree: Format Signed-off-by: kingbri --- Ferrite/API/AllDebridWrapper.swift | 20 +++++++++---------- Ferrite/API/OffCloudWrapper.swift | 10 +++++----- Ferrite/API/RealDebridWrapper.swift | 2 +- Ferrite/Extensions/Set.swift | 2 +- Ferrite/Utils/FormDataBody.swift | 2 +- Ferrite/ViewModels/LoggingManager.swift | 2 +- Ferrite/ViewModels/PluginManager.swift | 2 +- .../IndeterminateProgressView.swift | 7 +++---- .../Buttons/InstalledPluginButtonView.swift | 2 +- .../Buttons/PluginCatalogButtonView.swift | 2 +- .../Plugin/Info/PluginInfoMetaView.swift | 3 +-- .../Plugin/PluginTagsView.swift | 2 +- .../SearchResult/SearchResultInfoView.swift | 2 +- .../Settings/DefaultActionPickerView.swift | 2 +- .../PluginList/PluginListEditorView.swift | 2 +- .../PluginList/SettingsPluginListView.swift | 2 +- .../Settings/SettingsDebridInfoView.swift | 2 +- .../Views/SheetViews/ActionChoiceView.swift | 2 +- 18 files changed, 33 insertions(+), 35 deletions(-) diff --git a/Ferrite/API/AllDebridWrapper.swift b/Ferrite/API/AllDebridWrapper.swift index 30fcb31..c0083a0 100644 --- a/Ferrite/API/AllDebridWrapper.swift +++ b/Ferrite/API/AllDebridWrapper.swift @@ -81,7 +81,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { URLQueryItem(name: "pin", value: pin) ] - let request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/pin/check", queryItems: queryItems)) + let request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/pin/check", queryItems: queryItems)) // Timer to poll AD API for key authTask = Task { @@ -197,7 +197,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { } let queryItems = sendMagnets.map { URLQueryItem(name: "magnets[]", value: $0.hash) } - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/instant", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/instant", queryItems: queryItems)) let data = try await performRequest(request: &request, requestName: #function) let rawResponse = try jsonDecoder.decode(ADResponse.self, from: data).data @@ -246,7 +246,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { throw DebridError.FailedRequest(description: "The magnet link is invalid") } - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/upload")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/upload")) request.httpMethod = "POST" request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") @@ -271,7 +271,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { let queryItems = [ URLQueryItem(name: "id", value: magnetId) ] - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/status", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/status", queryItems: queryItems)) let data = try await performRequest(request: &request, requestName: #function) let rawResponse = try jsonDecoder.decode(ADResponse.self, from: data).data @@ -289,7 +289,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { let queryItems = [ URLQueryItem(name: "link", value: restrictedFile.streamUrlString) ] - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/link/unlock", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/link/unlock", queryItems: queryItems)) let data = try await performRequest(request: &request, requestName: "unlockLink") let rawResponse = try jsonDecoder.decode(ADResponse.self, from: data).data @@ -301,7 +301,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { let queryItems = [ URLQueryItem(name: "links[]", value: link) ] - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links/save", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links/save", queryItems: queryItems)) try await performRequest(request: &request, requestName: #function) } @@ -309,7 +309,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { // MARK: - Cloud methods func getUserMagnets() async throws { - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/status")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/status")) let data = try await performRequest(request: &request, requestName: #function) let rawResponse = try jsonDecoder.decode(ADResponse.self, from: data).data @@ -333,13 +333,13 @@ class AllDebrid: PollingDebridSource, ObservableObject { let queryItems = [ URLQueryItem(name: "id", value: cloudMagnetId) ] - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/magnet/delete", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/magnet/delete", queryItems: queryItems)) try await performRequest(request: &request, requestName: #function) } func getUserDownloads() async throws { - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links")) let data = try await performRequest(request: &request, requestName: #function) let rawResponse = try jsonDecoder.decode(ADResponse.self, from: data).data @@ -362,7 +362,7 @@ class AllDebrid: PollingDebridSource, ObservableObject { let queryItems = [ URLQueryItem(name: "link", value: downloadId) ] - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/user/links/delete", queryItems: queryItems)) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/user/links/delete", queryItems: queryItems)) try await performRequest(request: &request, requestName: #function) } diff --git a/Ferrite/API/OffCloudWrapper.swift b/Ferrite/API/OffCloudWrapper.swift index 9311a47..2e97431 100644 --- a/Ferrite/API/OffCloudWrapper.swift +++ b/Ferrite/API/OffCloudWrapper.swift @@ -118,7 +118,7 @@ class OffCloud: DebridSource, ObservableObject { return } - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/cache")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cache")) request.httpMethod = "POST" request.setValue("application/json", forHTTPHeaderField: "Content-Type") @@ -202,7 +202,7 @@ class OffCloud: DebridSource, ObservableObject { // Called as "cloud" in offcloud's API private func offcloudDownload(magnet: Magnet) async throws -> CloudDownloadResponse { - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/cloud")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud")) request.httpMethod = "POST" request.setValue("application/json", forHTTPHeaderField: "Content-Type") @@ -220,7 +220,7 @@ class OffCloud: DebridSource, ObservableObject { } private func cloudExplore(requestId: String) async throws -> CloudExploreResponse { - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/cloud/explore/\(requestId)")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud/explore/\(requestId)")) let data = try await performRequest(request: &request, requestName: "cloudExplore") let rawResponse = try jsonDecoder.decode(CloudExploreResponse.self, from: data) @@ -245,7 +245,7 @@ class OffCloud: DebridSource, ObservableObject { func deleteUserDownload(downloadId: String) {} func getUserMagnets() async throws { - var request = URLRequest(url: try buildRequestURL(urlString: "\(baseApiUrl)/cloud/history")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(baseApiUrl)/cloud/history")) let data = try await performRequest(request: &request, requestName: "cloudHistory") let rawResponse = try jsonDecoder.decode([CloudHistoryResponse].self, from: data) @@ -271,7 +271,7 @@ class OffCloud: DebridSource, ObservableObject { throw DebridError.InvalidPostBody } - var request = URLRequest(url: try buildRequestURL(urlString: "\(website)/cloud/remove/\(cloudMagnetId)")) + var request = try URLRequest(url: buildRequestURL(urlString: "\(website)/cloud/remove/\(cloudMagnetId)")) try await performRequest(request: &request, requestName: "cloudRemove") } } diff --git a/Ferrite/API/RealDebridWrapper.swift b/Ferrite/API/RealDebridWrapper.swift index f966df3..411d19b 100644 --- a/Ferrite/API/RealDebridWrapper.swift +++ b/Ferrite/API/RealDebridWrapper.swift @@ -17,7 +17,7 @@ class RealDebrid: PollingDebridSource, ObservableObject { "Ferrite's instant availability solely looks at a user's magnet library. \n\n" + "If you must use this service, it is recommended to download search results manually using the context menu. \n\n" + "This service does not inform if a magnet link is a batch before downloading." - + let cachedStatus: [String] = ["downloaded"] var authTask: Task? diff --git a/Ferrite/Extensions/Set.swift b/Ferrite/Extensions/Set.swift index b4ca668..bcb1a1d 100644 --- a/Ferrite/Extensions/Set.swift +++ b/Ferrite/Extensions/Set.swift @@ -1,5 +1,5 @@ // -// Array.swift +// Set.swift // Ferrite // // Created by Brian Dashore on 11/26/22. diff --git a/Ferrite/Utils/FormDataBody.swift b/Ferrite/Utils/FormDataBody.swift index d76e84b..52584cf 100644 --- a/Ferrite/Utils/FormDataBody.swift +++ b/Ferrite/Utils/FormDataBody.swift @@ -1,5 +1,5 @@ // -// MultipartFormDataRequest.swift +// FormDataBody.swift // Ferrite // // Created by Brian Dashore on 6/12/24. diff --git a/Ferrite/ViewModels/LoggingManager.swift b/Ferrite/ViewModels/LoggingManager.swift index c790fb6..76a3de8 100644 --- a/Ferrite/ViewModels/LoggingManager.swift +++ b/Ferrite/ViewModels/LoggingManager.swift @@ -1,5 +1,5 @@ // -// ToastViewModel.swift +// LoggingManager.swift // Ferrite // // Created by Brian Dashore on 7/19/22. diff --git a/Ferrite/ViewModels/PluginManager.swift b/Ferrite/ViewModels/PluginManager.swift index 58c57ab..05e7034 100644 --- a/Ferrite/ViewModels/PluginManager.swift +++ b/Ferrite/ViewModels/PluginManager.swift @@ -1,5 +1,5 @@ // -// SourceManager.swift +// PluginManager.swift // Ferrite // // Created by Brian Dashore on 7/25/22. diff --git a/Ferrite/Views/CommonViews/IndeterminateProgressView.swift b/Ferrite/Views/CommonViews/IndeterminateProgressView.swift index c9f6e33..8981557 100644 --- a/Ferrite/Views/CommonViews/IndeterminateProgressView.swift +++ b/Ferrite/Views/CommonViews/IndeterminateProgressView.swift @@ -21,13 +21,12 @@ struct IndeterminateProgressView: View { .foregroundColor(Color.accentColor) .frame(width: reader.size.width * 0.26, height: 6) .clipShape(Capsule()) - .offset(x: -reader.size.width * 0.6, y: 0) - .offset(x: reader.size.width * 1.2 * self.offset, y: 0) - .animation(.default.repeatForever().speed(0.5), value: self.offset) + .offset(x: reader.size.width * 1.2 * offset, y: 0) + .animation(.default.repeatForever().speed(0.5), value: offset) .onAppear { withAnimation { - self.offset = 1 + offset = 1 } } ) diff --git a/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift b/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift index 09d1b97..dcb2aa3 100644 --- a/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift +++ b/Ferrite/Views/ComponentViews/Plugin/Buttons/InstalledPluginButtonView.swift @@ -1,5 +1,5 @@ // -// InstalledSourceButtonView.swift +// InstalledPluginButtonView.swift // Ferrite // // Created by Brian Dashore on 8/5/22. diff --git a/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift b/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift index 4305798..750f14d 100644 --- a/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift +++ b/Ferrite/Views/ComponentViews/Plugin/Buttons/PluginCatalogButtonView.swift @@ -1,5 +1,5 @@ // -// SourceCatalogButtonView.swift +// PluginCatalogButtonView.swift // Ferrite // // Created by Brian Dashore on 8/5/22. diff --git a/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift b/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift index b5a2a68..76e9cd9 100644 --- a/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift +++ b/Ferrite/Views/ComponentViews/Plugin/Info/PluginInfoMetaView.swift @@ -32,8 +32,7 @@ struct PluginInfoMetaView: View { Group { Text("ID: \(selectedPlugin.id)") - if let pluginList = pluginLists.first(where: { $0.id == selectedPlugin.listId }) - { + if let pluginList = pluginLists.first(where: { $0.id == selectedPlugin.listId }) { Text("List: \(pluginList.name)") Text("List ID: \(pluginList.id.uuidString)") } else { diff --git a/Ferrite/Views/ComponentViews/Plugin/PluginTagsView.swift b/Ferrite/Views/ComponentViews/Plugin/PluginTagsView.swift index e70fe74..cc07aac 100644 --- a/Ferrite/Views/ComponentViews/Plugin/PluginTagsView.swift +++ b/Ferrite/Views/ComponentViews/Plugin/PluginTagsView.swift @@ -1,5 +1,5 @@ // -// PluginTagView.swift +// PluginTagsView.swift // Ferrite // // Created by Brian Dashore on 2/7/23. diff --git a/Ferrite/Views/ComponentViews/SearchResult/SearchResultInfoView.swift b/Ferrite/Views/ComponentViews/SearchResult/SearchResultInfoView.swift index 4bb2528..1d06dc6 100644 --- a/Ferrite/Views/ComponentViews/SearchResult/SearchResultInfoView.swift +++ b/Ferrite/Views/ComponentViews/SearchResult/SearchResultInfoView.swift @@ -1,5 +1,5 @@ // -// SearchResultRDView.swift +// SearchResultInfoView.swift // Ferrite // // Created by Brian Dashore on 7/26/22. diff --git a/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift b/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift index 0aa8b00..6aac6a9 100644 --- a/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift +++ b/Ferrite/Views/ComponentViews/Settings/DefaultActionPickerView.swift @@ -1,5 +1,5 @@ // -// DefaultActionsPickerViews.swift +// DefaultActionPickerView.swift // Ferrite // // Created by Brian Dashore on 8/11/22. diff --git a/Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift b/Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift index ceb8fcd..d317b4f 100644 --- a/Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift +++ b/Ferrite/Views/ComponentViews/Settings/PluginList/PluginListEditorView.swift @@ -1,5 +1,5 @@ // -// SourceListEditorView.swift +// PluginListEditorView.swift // Ferrite // // Created by Brian Dashore on 7/25/22. diff --git a/Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift b/Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift index 7391944..931b950 100644 --- a/Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift +++ b/Ferrite/Views/ComponentViews/Settings/PluginList/SettingsPluginListView.swift @@ -1,5 +1,5 @@ // -// SettingsSourceListView.swift +// SettingsPluginListView.swift // Ferrite // // Created by Brian Dashore on 7/25/22. diff --git a/Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift b/Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift index 479acb9..7955084 100644 --- a/Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift +++ b/Ferrite/Views/ComponentViews/Settings/SettingsDebridInfoView.swift @@ -1,5 +1,5 @@ // -// DebridInfoView.swift +// SettingsDebridInfoView.swift // Ferrite // // Created by Brian Dashore on 3/5/23. diff --git a/Ferrite/Views/SheetViews/ActionChoiceView.swift b/Ferrite/Views/SheetViews/ActionChoiceView.swift index 0e9702e..4753a26 100644 --- a/Ferrite/Views/SheetViews/ActionChoiceView.swift +++ b/Ferrite/Views/SheetViews/ActionChoiceView.swift @@ -1,5 +1,5 @@ // -// MagnetChoiceView.swift +// ActionChoiceView.swift // Ferrite // // Created by Brian Dashore on 7/20/22.