Merge branch 'develop' of github.com:filestack/filestack-swift into develop

Author: Ruben Nine

FilestackSDK/Internal/Uploaders/MultipartUpload.swift

@@ -154,7 +154,7 @@ private extension MultipartUpload {
     func doUploadFile() {
         currentStatus = .inProgress
 
-        let fileName = options.storeOptions.filename ?? UUID().uuidString
+        let fileName = options.storeOptions.filename ?? uploadable.filename ?? UUID().uuidString
         let mimeType = options.storeOptions.mimeType ?? uploadable.mimeType ?? "text/plain"
 
         guard let fileSize = uploadable.size, !fileName.isEmpty else {

FilestackSDK/Public/Extensions/Data+Uploadable.swift

@@ -9,6 +9,10 @@
 import Foundation
 
 extension Data: Uploadable {
+    public var filename: String? {
+        return nil
+    }
+
     public var size: UInt64? {
         return UInt64(count)
     }

FilestackSDK/Public/Extensions/URL+Uploadable.swift

@@ -10,6 +10,10 @@ import Foundation
 import MobileCoreServices
 
 extension URL: Uploadable {
+    public var filename: String? {
+        return lastPathComponent
+    }
+
     public var size: UInt64? {
         guard let attributtes = try? FileManager.default.attributesOfItem(atPath: relativePath) else { return nil }
 

FilestackSDK/Public/Protocols/Uploadable.swift

@@ -10,6 +10,8 @@ import Foundation
 
 /// The protocol any uploadables must conform to.
 public protocol Uploadable {
+    /// The fileName of this uploadable, or `nil` if unavailable.
+    var filename: String? { get }
     /// The size of this uploadable in bytes, or `nil` if unavailable.
     var size: UInt64? { get }
     /// The MIME type of this uploadable, or `nil` if unavailable.