refactor: return object instead json string

Author: andredestro

Sources/IONCameraLib/Extensions/IONCAMRFlowResultsDelegate+Default.swift

@@ -8,18 +8,10 @@ extension IONCAMRFlowResultsHandler {
     func didReturn(_ result: Result<any Encodable, IONCAMRError>) {
         switch result {
         case .success(let value):
-            do {
-                if let mediaResult = value as? IONCAMRMediaResult {
-                    let mediaResultText = try self.treatSingle(mediaResult)
-                    self.responseDelegate?.callback(result: mediaResultText)
-                } else if let mediaArray = value as? [IONCAMRMediaResult] {
-                    let mediaArrayText = try self.treatMultiple(mediaArray)
-                    self.responseDelegate?.callback(result: mediaArrayText)
-                }
-            } catch let error as IONCAMRError {
-                self.responseDelegate?.callback(error: error)
-            } catch {
-                self.responseDelegate?.callback(error: .generalIssue)
+            if let mediaResult = value as? IONCAMRMediaResult {
+                self.responseDelegate?.callback(result: mediaResult)
+            } else if let mediaArray = value as? [IONCAMRMediaResult] {
+                self.responseDelegate?.callback(result: mediaArray)
             }
         case .failure(let error):
             self.responseDelegate?.callback(error: error)
@@ -29,23 +21,4 @@ extension IONCAMRFlowResultsHandler {
     func didCancel(_ error: IONCAMRError) {
         self.responseDelegate?.callback(error: error)
     }
-    
-    private func encodeToStructure<T>(_ value: T) throws -> String where T: Encodable {
-        let encoder = JSONEncoder()
-        encoder.dateEncodingStrategy = .iso8601
-        guard let mediaResultData = try? encoder.encode(value), let mediaResultText = String(data: mediaResultData, encoding: .utf8)
-        else { throw IONCAMRError.invalidEncodeResultMedia }
-        return mediaResultText
-    }
-    
-    private func treatSingle(_ value: IONCAMRMediaResult) throws -> String {
-        if case .picture = value.type, value.uri.isEmpty {
-            return value.thumbnail
-        }
-        return try self.encodeToStructure(value)
-    }
-    
-    private func treatMultiple(_ value: [IONCAMRMediaResult]) throws -> String {
-        try self.encodeToStructure(value)
-    }
 }

Sources/IONCameraLib/Models/IONCAMRMediaResult.swift

@@ -1,9 +1,9 @@
-struct IONCAMRMediaResult {
-    let type: IONCAMRMediaType
-    let uri: String
-    let thumbnail: String
-    let metadata: IONCAMRMetadata?
-    let saved: Bool?
+public struct IONCAMRMediaResult {
+    public let type: IONCAMRMediaType
+    public let uri: String
+    public let thumbnail: String
+    public let metadata: IONCAMRMetadata?
+    public let saved: Bool?
 
     init(type: IONCAMRMediaType, uri: String, thumbnail: String, metadata: IONCAMRMetadata? = nil, saved: Bool? = nil   ) {
         self.type = type
@@ -33,7 +33,7 @@ extension IONCAMRMediaResult: Encodable {
         case type, uri, thumbnail, metadata, saved
     }
 
-    func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.type.enumerator.rawValue, forKey: .type)
         try container.encode(self.uri, forKey: .uri)

Sources/IONCameraLib/Models/IONCAMRMetadata.swift

@@ -1,11 +1,11 @@
 import Foundation
 
-struct IONCAMRMetadata {
-    var size: UInt64
-    var duration: Int?
-    var format: String
-    var resolution: String
-    var creationDate: Date
+public struct IONCAMRMetadata {
+    public var size: UInt64
+    public var duration: Int?
+    public var format: String
+    public var resolution: String
+    public var creationDate: Date
 
     init(size: UInt64, duration: Int? = nil, format: String, resolution: String, creationDate: Date) {
         self.size = size
@@ -21,7 +21,7 @@ extension IONCAMRMetadata: Encodable {
         case size, duration, format, resolution, creationDate
     }
 
-    func encode(to encoder: Encoder) throws {
+    public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.size, forKey: .size)
         try container.encodeIfPresent(self.duration, forKey: .duration)

Sources/IONCameraLib/Protocols/IONCAMRCallbackDelegate.swift

@@ -1,23 +1,6 @@
 /// Delegate for the callback return calls for the plugin
 public protocol IONCAMRCallbackDelegate: AnyObject {
-    /// Callback to be triggered.
-    /// - Parameters:
-    ///   - result: The text to be returned in case of success.
-    ///   - error: The error to be returned in case of error.
-    func callback(result: String?, error: IONCAMRError?)
-}
-
-/// Provides accelerators for callbacks.
-extension IONCAMRCallbackDelegate {
-    /// Triggers the callback when there's an error
-    /// - Parameter error: Error to be thrown
-    func callback(error: IONCAMRError) {
-        self.callback(result: nil, error: error)
-    }
-    
-    /// Triggers the callback when there's a success text
-    /// - Parameter result: Text to be returned
-    func callback(result: String) {
-        self.callback(result: result, error: nil)
-    }
+    func callback(error: IONCAMRError)
+    func callback(result: IONCAMRMediaResult)
+    func callback(result: [IONCAMRMediaResult])
 }