Update Sources/Vapor/Utilities/FileIO.swift

Co-authored-by: Gwynne Raskind <gwynne@vapor.codes>
vapor · May 7, 2024 · 0d6b4f4 · 0d6b4f4
1 parent b134912
commit 0d6b4f4
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Sources/Vapor/Utilities/FileIO.swift b/Sources/Vapor/Utilities/FileIO.swift
@@ -94,20 +94,18 @@ public struct FileIO: Sendable {
         chunkSize: Int = NonBlockingFileIO.defaultChunkSize,
         onRead: @Sendable @escaping (ByteBuffer) -> EventLoopFuture<Void>
     ) -> EventLoopFuture<Void> {
-        return self.request.eventLoop.makeFutureWithTask { () -> Int64? in
-            let fileInfo = try await FileSystem.shared.info(forFileAt: .init(path))
-            return fileInfo?.size
-        }.flatMap { fileSize in
-            guard let fileSize = fileSize else {
-                return self.request.eventLoop.makeFailedFuture(Abort(.internalServerError))
+        self.request.eventLoop.makeFutureWithTask {
+            guard let fileSize = try await FileSystem.shared.info(forFileAt: .init(path))?.size else {
+                throw Abort(.internalServerError)
             }
-            return self.read(
+            try await self.read(
                 path: path,
                 fromOffset: 0,
                 byteCount: Int(fileSize),
                 chunkSize: chunkSize,
                 onRead: onRead
-            )
+            ).get()
+        }
         }
     }