Read off file size

Author: andrewjl-mux

Sources/MuxUploadSDK/InternalUtilities/ChunkedFile.swift

@@ -92,11 +92,9 @@ class ChunkedFile {
             throw ChunkedFileError.invalidState("doReadNextChunk called without file handle. Did you call open()?")
         }
         let data = try fileHandle.read(upToCount: chunkSize)
-
         let fileSize = try fileManager.fileSizeOfItem(
             atPath: fileURL.path
         )
-
         guard let data = data else {
             // Called while already at the end of the file. We read zero bytes, "ending" at the end of the file
             return FileChunk(startByte: fileSize, endByte: fileSize, totalFileSize: fileSize, chunkData: Data(capacity: 0))

Sources/MuxUploadSDK/Upload/ChunkedFileUploader.swift

@@ -24,7 +24,7 @@ class ChunkedFileUploader {
     private var delegates: [String : ChunkedFileUploaderDelegate] = [:]
 
     private let file: ChunkedFile
-    private var currentWorkTask: Task<(), Never>? = nil
+    private var currentWorkTask: Task<(), Error>? = nil
     private var _currentState: InternalUploadState = .ready
     private var overallProgress: Progress = Progress()
     private var lastReadCount: UInt64 = 0
@@ -94,7 +94,7 @@ class ChunkedFileUploader {
             do {
                 // It's fine if it's already open, that's handled by ignoring the call
                 let fileSize = try FileManager.default.fileSizeOfItem(
-                    atPath: uploadInfo.videoFile.path
+                    atPath: inputFileURL.path
                 )
                 let result = try await makeWorker().performUpload()
                 file.close()
@@ -137,21 +137,26 @@ class ChunkedFileUploader {
                 } else {
                     MuxUploadSDK.logger?.debug("Task finished due to error in state \(String(describing: self.currentState))")
                     let uploadError = InternalUploaderError(reason: error, lastByte: lastReadCount)
+                    notifyStateFromWorker(.failure(uploadError))
 
                     if shouldReport {
+                        let fileSize = try FileManager.default.fileSizeOfItem(
+                            atPath: inputFileURL.path
+                        )
+
                         #warning("Start and end time need to be fixed")
                         reporter.reportUploadFailure(
                             transportStartTime: 0,
                             transportEndTime: 0,
                             errorDescription: uploadError.localizedDescription,
-                            inputSize: file.fileSize,
+                            inputSize: fileSize,
                             inputStandardizationEnabled: uploadInfo.options.inputStandardization.isEnabled,
                             inputDuration: 0.0,
                             uploadURL: uploadInfo.uploadURL
                         )
                     }
 
-                    notifyStateFromWorker(.failure(uploadError))
+
                 }
             }
         }
@@ -289,9 +294,8 @@ fileprivate actor Worker {
 
         let startTime = Date().timeIntervalSince1970
         let fileSize = try FileManager.default.fileSizeOfItem(
-            atPath: uploadInfo.videoFile.path
+            atPath: inputFileURL.path
         )
-
         let wideFileSize: Int64
 
         // Prevent overflow if UInt64 exceeds Int64.max