swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Media upload: be more resilient against system errors in fetching file size

Browse Source
This commit is contained in:
Stefan Ceriu 2023-09-19 14:53:44 +03:00 committed by Stefan Ceriu
parent c67de040e5
commit dd0a36904c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ElementX/Sources/Services/Media/MediaUploadingPreprocessor.swift
View File

@ -144,8 +144,8 @@ struct MediaUploadingPreprocessor {
case .success(let result):
switch await generateThumbnailForImage(at: url) {
case .success(let thumbnailResult):
let imageSize = try? UInt64(FileManager.default.sizeForItem(at: result.url))
let thumbnailSize = try? UInt64(FileManager.default.sizeForItem(at: thumbnailResult.url))
let imageSize = (try? UInt64(FileManager.default.sizeForItem(at: result.url))) ?? 0
let thumbnailSize = (try? UInt64(FileManager.default.sizeForItem(at: thumbnailResult.url))) ?? 0
let thumbnailInfo = ThumbnailInfo(height: UInt64(thumbnailResult.height),
width: UInt64(thumbnailResult.width),
@ -182,8 +182,8 @@ struct MediaUploadingPreprocessor {
case .success(let result):
switch await generateThumbnailForVideoAt(result.url) {
case .success(let thumbnailResult):
let videoSize = try? UInt64(FileManager.default.sizeForItem(at: result.url))
let thumbnailSize = try? UInt64(FileManager.default.sizeForItem(at: thumbnailResult.url))
let videoSize = ((try? UInt64(FileManager.default.sizeForItem(at: result.url))) ?? 0) ?? 0
let thumbnailSize = (try? UInt64(FileManager.default.sizeForItem(at: thumbnailResult.url))) ?? 0
let thumbnailInfo = ThumbnailInfo(height: UInt64(thumbnailResult.height),
width: UInt64(thumbnailResult.width),
@ -216,7 +216,7 @@ struct MediaUploadingPreprocessor {
/// - mimeType: the mimeType extracted from the UTType
/// - Returns: Returns a `MediaInfo.audio` containing the file URL plus the corresponding `AudioInfo`
private func processAudio(at url: URL, mimeType: String?) async -> Result<MediaInfo, MediaUploadingPreprocessorError> {
let fileSize = try? UInt64(FileManager.default.sizeForItem(at: url))
let fileSize = (try? UInt64(FileManager.default.sizeForItem(at: url))) ?? 0
let asset = AVURLAsset(url: url)
guard let durationInSeconds = try? await asset.load(.duration).seconds else {
@ -234,7 +234,7 @@ struct MediaUploadingPreprocessor {
/// - mimeType: the mimeType extracted from the UTType
/// - Returns: Returns a `MediaInfo.file` containing the file URL plus the corresponding `FileInfo`
private func processFile(at url: URL, mimeType: String?) async -> Result<MediaInfo, MediaUploadingPreprocessorError> {
let fileSize = try? UInt64(FileManager.default.sizeForItem(at: url))
let fileSize = (try? UInt64(FileManager.default.sizeForItem(at: url))) ?? 0
let fileInfo = FileInfo(mimetype: mimeType, size: fileSize, thumbnailInfo: nil, thumbnailSource: nil)
return .success(.file(fileURL: url, fileInfo: fileInfo))