Ensure media is processed properly
This commit is contained in:
parent
7ff10d999e
commit
5fcc8c780e
|
@ -21,34 +21,38 @@ public extension MediaProcessingService {
|
|||
static func dataAndMimeType(itemProvider: NSItemProvider) -> AnyPublisher<(data: Data, mimeType: String), Error> {
|
||||
let registeredTypes = itemProvider.registeredTypeIdentifiers.compactMap(UTType.init)
|
||||
|
||||
let uniformType: UTType
|
||||
let mimeType: String
|
||||
let dataPublisher: AnyPublisher<Data, Error>
|
||||
|
||||
if let uniformTypeWithUploadableMimeType = registeredTypes.first(where: {
|
||||
if let uniformType = registeredTypes.first(where: {
|
||||
guard let mimeType = $0.preferredMIMEType else { return false }
|
||||
|
||||
return Self.uploadableMimeTypes.contains(mimeType)
|
||||
}), let preferredMIMEType = uniformTypeWithUploadableMimeType.preferredMIMEType {
|
||||
uniformType = uniformTypeWithUploadableMimeType
|
||||
}), let preferredMIMEType = uniformType.preferredMIMEType {
|
||||
mimeType = preferredMIMEType
|
||||
} else if registeredTypes == [UTType.image], let pngMIMEType = UTType.png.preferredMIMEType {
|
||||
uniformType = .image
|
||||
mimeType = pngMIMEType
|
||||
} else {
|
||||
return Fail(error: MediaProcessingError.invalidMimeType).eraseToAnyPublisher()
|
||||
}
|
||||
|
||||
return Future<Data, Error> { promise in
|
||||
itemProvider.loadItem(forTypeIdentifier: uniformType.identifier, options: nil) { item, error in
|
||||
dataPublisher = Future<Data, Error> { promise in
|
||||
itemProvider.loadFileRepresentation(forTypeIdentifier: uniformType.identifier) { url, error in
|
||||
if let error = error {
|
||||
promise(.failure(error))
|
||||
} else if let url = item as? URL {
|
||||
} else if let url = url {
|
||||
if uniformType.conforms(to: .image) && uniformType != .gif {
|
||||
promise(imageData(url: url, type: uniformType))
|
||||
} else {
|
||||
promise(Result { try Data(contentsOf: url) })
|
||||
}
|
||||
} else if let image = item as? UIImage, let data = image.pngData() { // screenshots
|
||||
} else {
|
||||
promise(.failure(MediaProcessingError.fileURLNotFound))
|
||||
}
|
||||
}
|
||||
}
|
||||
.eraseToAnyPublisher()
|
||||
} else if registeredTypes == [UTType.image], let pngMIMEType = UTType.png.preferredMIMEType { // screenshot
|
||||
mimeType = pngMIMEType
|
||||
dataPublisher = Future<Data, Error> { promise in
|
||||
itemProvider.loadItem(forTypeIdentifier: UTType.image.identifier, options: nil) { item, error in
|
||||
if let error = error {
|
||||
promise(.failure(error))
|
||||
} else if let image = item as? UIImage, let data = image.pngData() {
|
||||
do {
|
||||
let url = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
|
||||
.appendingPathComponent(UUID().uuidString)
|
||||
|
@ -64,8 +68,12 @@ public extension MediaProcessingService {
|
|||
}
|
||||
}
|
||||
}
|
||||
.map { (data: $0, mimeType: mimeType) }
|
||||
.eraseToAnyPublisher()
|
||||
} else {
|
||||
return Fail(error: MediaProcessingError.invalidMimeType).eraseToAnyPublisher()
|
||||
}
|
||||
|
||||
return dataPublisher.map { (data: $0, mimeType: mimeType) }.eraseToAnyPublisher()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue