chore(storage): bring MultipartFormData to repository (#553)

supabase · Oct 7, 2024 · be154a1 · be154a1
1 parent b7fb06e
commit be154a1
Show file tree

Hide file tree

Showing 6 changed files with 692 additions and 80 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "multipartformdata",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/grdsdev/MultipartFormData",
-      "state" : {
-        "revision" : "ed7abea9cfc6c3b5e77a73fe6842c57a372d2017",
-        "version" : "0.1.0"
-      }
-    },
     {
       "identity" : "swift-concurrency-extras",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -22,7 +22,6 @@ let package = Package(
     .library(name: "Supabase", targets: ["Supabase", "Functions", "PostgREST", "Auth", "Realtime", "Storage"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/grdsdev/MultipartFormData", from: "0.1.0"),
     .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
@@ -131,7 +130,6 @@ let package = Package(
     .target(
       name: "Storage",
       dependencies: [
-        "MultipartFormData",
         "Helpers",
       ]
     ),

diff --git a/Sources/Storage/Helpers.swift b/Sources/Storage/Helpers.swift
@@ -7,70 +7,6 @@
 
 import Foundation
 
-#if canImport(MobileCoreServices)
-  import MobileCoreServices
-#elseif canImport(CoreServices)
-  import CoreServices
-#endif
-
-#if canImport(UniformTypeIdentifiers)
-  import UniformTypeIdentifiers
-
-  func mimeType(forPathExtension pathExtension: String) -> String {
-    #if swift(>=5.9)
-      if #available(iOS 14, macOS 11, tvOS 14, watchOS 7, visionOS 1, *) {
-        return UTType(filenameExtension: pathExtension)?.preferredMIMEType
-          ?? "application/octet-stream"
-      } else {
-        if let id = UTTypeCreatePreferredIdentifierForTag(
-          kUTTagClassFilenameExtension, pathExtension as CFString, nil
-        )?.takeRetainedValue(),
-          let contentType = UTTypeCopyPreferredTagWithClass(id, kUTTagClassMIMEType)?
-          .takeRetainedValue()
-        {
-          return contentType as String
-        }
-
-        return "application/octet-stream"
-      }
-    #else
-      if #available(iOS 14, macOS 11, tvOS 14, watchOS 7, *) {
-        return UTType(filenameExtension: pathExtension)?.preferredMIMEType
-          ?? "application/octet-stream"
-      } else {
-        if let id = UTTypeCreatePreferredIdentifierForTag(
-          kUTTagClassFilenameExtension, pathExtension as CFString, nil
-        )?.takeRetainedValue(),
-          let contentType = UTTypeCopyPreferredTagWithClass(id, kUTTagClassMIMEType)?
-          .takeRetainedValue()
-        {
-          return contentType as String
-        }
-
-        return "application/octet-stream"
-      }
-    #endif
-  }
-#else
-
-  // MARK: - Private - Mime Type
-
-  func mimeType(forPathExtension pathExtension: String) -> String {
-    #if canImport(CoreServices) || canImport(MobileCoreServices)
-      if let id = UTTypeCreatePreferredIdentifierForTag(
-        kUTTagClassFilenameExtension, pathExtension as CFString, nil
-      )?.takeRetainedValue(),
-        let contentType = UTTypeCopyPreferredTagWithClass(id, kUTTagClassMIMEType)?
-        .takeRetainedValue()
-      {
-        return contentType as String
-      }
-    #endif
-
-    return "application/octet-stream"
-  }
-#endif
-
 extension String {
   var pathExtension: String {
     (self as NSString).pathExtension