Merge pull request #14 from iGerman00/main, close #12

uploader testing, callback for customUpload
castdrian · Jul 19, 2023 · 113e6a1 · 113e6a1
2 parents 9555632 + 0336aea
commit 113e6a1
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 1 deletion.
diff --git a/ishare/Http/Custom.swift b/ishare/Http/Custom.swift
@@ -11,7 +11,12 @@ import Defaults
 import AppKit
 import SwiftyJSON
 
-func customUpload(fileURL: URL, specification: CustomUploader, completion: @escaping () -> Void) {
+enum CustomUploadError: Error {
+    case responseParsing
+    case responseRetrieval
+}
+
+func customUpload(fileURL: URL, specification: CustomUploader, callback: ((Error?, URL?) -> Void)? = nil, completion: @escaping () -> Void) {
     @Default(.imageFileFormName) var imageFileFormName
     @Default(.captureFileType) var fileType
 
@@ -54,13 +59,16 @@ func customUpload(fileURL: URL, specification: CustomUploader, completion: @esca
                     pasteboard.clearContents()
                     pasteboard.setString(modifiedLink, forType: .string)
 
+                    callback?(nil, URL(string: modifiedLink))
                     completion()
                 } else {
                     print("Error parsing response or retrieving file link")
+                    callback?(CustomUploadError.responseParsing, nil)
                     completion()
                 }
             } else {
                 print("Error retrieving response data")
+                callback?(CustomUploadError.responseRetrieval, nil)
                 completion()
             }
         }

diff --git a/ishare/Views/Settings/UploaderSettings.swift b/ishare/Views/Settings/UploaderSettings.swift
@@ -36,6 +36,15 @@ struct UploaderSettingsView: View {
                             Image(systemName: "trash")
                         }
                         .buttonStyle(BorderlessButtonStyle())
+                        .help("Delete Uploader")
+
+                        Button(action: {
+                            testCustomUploader(uploader)
+                        }) {
+                            Image(systemName: "icloud.and.arrow.up")
+                        }
+                        .buttonStyle(BorderlessButtonStyle())
+                        .help("Test Uploader")
                     }
                     .padding(.horizontal)
                     .padding(.vertical, 4)
@@ -88,6 +97,51 @@ struct UploaderSettingsView: View {
             uploadType = .IMGUR
         }
     }
+
+    private func testCustomUploader(_ uploader: CustomUploader) {
+        let image = NSImage(named: "AppIcon")
+        guard let imageData = image?.tiffRepresentation else { return }
+        let fileManager = FileManager.default
+        let temporaryDirectory = fileManager.temporaryDirectory
+        let fileURL = temporaryDirectory.appendingPathComponent("appIconImage.jpg")
+        do {
+            try imageData.write(to: fileURL)
+        } catch {
+            print("Failed to write image file: \(error)")
+            return
+        }
+
+        let callback: ((Error?, URL?) -> Void) = { error, finalURL in
+            if let error = error {
+                    print("Upload error: \(error)")
+                    DispatchQueue.main.async {
+                        let alert = NSAlert()
+                        alert.alertStyle = .critical
+                        alert.messageText = "Upload Error"
+                        alert.informativeText = "An error occurred during the upload process."
+                        alert.runModal()
+                    }
+                } else if let url = finalURL {
+                    print("Final URL: \(url)")
+                    DispatchQueue.main.async {
+                        let alert = NSAlert()
+                        alert.alertStyle = .informational
+                        alert.messageText = "Upload Successful"
+                        alert.informativeText = "The file was uploaded successfully."
+                        alert.runModal()
+                    }
+                }
+        }
+
+        customUpload(fileURL: fileURL, specification: uploader, callback: callback) {}
+
+        // Clean up temp
+        do {
+            try FileManager.default.removeItem(at: fileURL)
+        } catch {
+            print("Failed to delete temporary file: \(error)")
+        }
+    }
 
     private func clearAllUploaders() {
         savedCustomUploaders = nil