Improved error handling

mlemgroup · Sep 29, 2023 · 2b324ef · 2b324ef
1 parent d36cc85
commit 2b324ef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/Mlem/API/APIClient/APIClient+Pictrs.swift b/Mlem/API/APIClient/APIClient+Pictrs.swift
@@ -53,8 +53,13 @@ extension APIClient {
             let decoder = JSONDecoder()
             decoder.keyDecodingStrategy = .convertFromSnakeCase
             if let data = data {
-                let response = try? decoder.decode(ImageUploadResponse.self, from: data)
-                completionCallback(response)
+                do {
+                    let response = try decoder.decode(ImageUploadResponse.self, from: data)
+                    completionCallback(response)
+                } catch {
+                    print("Upload failed: \(String(data: data, encoding: .utf8))")
+                    completionCallback(nil)
+                }
             }
         })
 
@@ -66,7 +71,7 @@ extension APIClient {
 
 struct ImageUploadResponse: Codable {
     public let msg: String
-    public let files: [PictrsFile]
+    public let files: [PictrsFile]?
 }
 
 struct PictrsFile: Codable, Equatable {

diff --git a/Mlem/Models/PictrsImageModel.swift b/Mlem/Models/PictrsImageModel.swift
@@ -11,7 +11,7 @@ struct PictrsImageModel {
     enum UploadState {
         case uploading(progress: Double)
         case uploaded(file: PictrsFile?)
-        case failed(Error?)
+        case failed(String?)
     }
     var image: Image?
     var state: UploadState = .uploading(progress: 0)

diff --git a/Mlem/Repositories/PictrsRespository.swift b/Mlem/Repositories/PictrsRespository.swift
@@ -26,23 +26,29 @@ class PictrsRespository {
                     imageModel.image = Image(uiImage: uiImage)
                 }
                 return try await apiClient.uploadImage(data, onProgress: {
+                    print("Uploading: \(round($0*100))%")
                     imageModel.state = .uploading(progress: $0)
                     updateCallback(imageModel)
                 }, onCompletion: { response in
                     if let response = response {
-                        if let firstFile = response.files.first {
+                        if let firstFile = response.files?.first {
                             imageModel.state = .uploaded(file: firstFile)
                             updateCallback(imageModel)
+                        } else {
+                            print("Upload failed: \(response.msg)")
+                            imageModel.state = .failed(response.msg)
+                            updateCallback(imageModel)
                         }
                     } else {
+                        print("Upload failed: Response is nil")
                         imageModel.state = .failed(nil)
                         updateCallback(imageModel)
                     }
                 })
-
             }
         } catch {
-            imageModel.state = .failed(error)
+            print("Upload failed: \(error)")
+            imageModel.state = .failed(nil)
             updateCallback(imageModel)
         }
         return nil

diff --git a/Mlem/Views/Shared/Components/ImageUploadView.swift b/Mlem/Views/Shared/Components/ImageUploadView.swift
@@ -39,8 +39,8 @@ struct ImageUploadView: View {
                                 .frame(width: 100, height: 10)
                         case .uploaded:
                             Text("Uploaded")
-                        case .failed:
-                            Text("Failed")
+                        case .failed(let msg):
+                            Text(msg ?? "Failed")
                                 .foregroundStyle(.red)
                         }
                     }