Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let approachableConcurrency: [SwiftSetting] = [

let package = Package(
name: "SimpleHTTP",
platforms: [.iOS(.v13), .macOS(.v13)],
platforms: [.iOS(.v14), .macOS(.v13)],
products: [
.library(name: "SimpleHTTPFoundation", targets: ["SimpleHTTPFoundation"]),
.library(name: "SimpleHTTP", targets: ["SimpleHTTP"])
Expand Down
28 changes: 3 additions & 25 deletions Sources/SimpleHTTP/MultipartForm/MultipartFormData.swift
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import Foundation
import UniformTypeIdentifiers

#if os(iOS) || os(watchOS) || os(tvOS)
import MobileCoreServices
#elseif os(macOS)
import CoreServices
#endif

struct Header: Hashable, Sendable {
let name: HTTPHeader
let value: String
Expand Down Expand Up @@ -157,27 +151,11 @@ public struct MultipartFormData: Sendable {
}

private func mimeType(from url: URL) -> String {
if #available(iOS 14.0, *), #available(macOS 11.0, *) {
guard let type = UTType(filenameExtension: url.pathExtension), let mime = type.preferredMIMEType else {
return HTTPContentType.octetStream.value
}

return mime
}

let contentType = UTTypeCreatePreferredIdentifierForTag(
kUTTagClassFilenameExtension,
url.pathExtension as CFString,
nil
)
.flatMap { UTTypeCopyPreferredTagWithClass($0.takeRetainedValue(), kUTTagClassMIMEType) }
.map { $0.takeRetainedValue() }

if let contentType = contentType {
return contentType as String
guard let type = UTType(filenameExtension: url.pathExtension), let mime = type.preferredMIMEType else {
return HTTPContentType.octetStream.value
}

return HTTPContentType.octetStream.value
return mime
}

}
Loading