Merge pull request #1 from apivideo/Fix/large-upload

Fix() file size detection & change filepath to url for  inputstream

Author: RomainPetit1

CHANGELOG.md

@@ -1,3 +1,7 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [0.0.3] - 2021-11-22
+- Fix large upload request time out
+- Fix callback on wrong token
+

Example/Podfile.lock

@@ -1,27 +1,16 @@
 PODS:
-  - Nimble (9.0.1)
-  - Quick (2.2.1)
-  - VideoUploaderIos (0.1.0)
+  - VideoUploaderIos (0.0.1)
 
 DEPENDENCIES:
-  - Nimble (~> 9.0.1)
-  - Quick (~> 2.2.0)
   - VideoUploaderIos (from `../`)
 
-SPEC REPOS:
-  trunk:
-    - Nimble
-    - Quick
-
 EXTERNAL SOURCES:
   VideoUploaderIos:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Nimble: 7bed62ffabd6dbfe05f5925cbc43722533248990
-  Quick: f5754d69b7013f5864c29aab9ae6f0c79c5bc200
-  VideoUploaderIos: 1d4030a68a67a5c629ef828bdc31ff1cca3f3864
+  VideoUploaderIos: 86cd961775812209075c569ac9be9cac39eaf134
 
-PODFILE CHECKSUM: 76527896bd7398adfe97a9831371340404fe8331
+PODFILE CHECKSUM: ac1f8a3fcdb1f6ef59acc6c0ee946d9f4c1c456d
 
 COCOAPODS: 1.10.1

VideoUploaderIos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'VideoUploaderIos'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'A library to upload video files to api.video platform.'
 
 # This description is used to generate tags and improve search results.

VideoUploaderIos/Classes/VideoUploader.swift

@@ -33,7 +33,8 @@ public class VideoUploader {
     }
 
     private func upload(apiPath: String, bearerToken: String?, fileName: String, filePath: String, url: URL, completion: @escaping (Dictionary<String, AnyObject>?, ApiError?) -> ()) {
-        let fileSize = self.getFileSize(path: filePath)
+        let data = try? Data(contentsOf: url)
+        let fileSize = data!.count
         if(fileSize <= chunkSize) {
             self.uploadWithoutChunk(apiPath: apiPath, bearerToken: bearerToken, fileName: fileName, filePath: filePath, url: url, completion: completion)
         } else {
@@ -85,6 +86,8 @@ public class VideoUploader {
     }
 
     private func uploadByChunk(apiPath: String, bearerToken: String?, fileName: String, filePath: String, url: URL, completion: @escaping (Dictionary<String, AnyObject>?, ApiError?) -> ()) {
+        
+        var hasError: Bool = false
 
         let data = try? Data(contentsOf: url)
         let fileSize = data!.count
@@ -97,7 +100,7 @@ public class VideoUploader {
         let mimetype = mimeType(for: filePath)
 
         for offset in stride(from: 0, through: fileSize, by: chunkSize){
-            let fileStream = InputStream(fileAtPath: filePath)!
+            let fileStream = InputStream(url: url)!
             var chunkEnd = offset + chunkSize
 
             // if last chunk
@@ -131,13 +134,19 @@ public class VideoUploader {
                     if(videoId == nil) {
                         videoId = json?["videoId"] as? String
                     }
-                    semaphore.signal()
+                    
                 }else{
                     completion(nil, apiError)
+                    hasError = true
                 }
+                semaphore.signal()
+                
             }
             semaphore.wait()
             fileStream.close()
+            if(hasError){
+                return
+            }
         }
         if(readBytes == fileSize){
             completion(video, nil)