Merge pull request #90 from tus/swift-development

2.1.0

Author: MMasterson

.DS_Store

@@ -18,6 +18,7 @@ DerivedData
 *.xcuserstate
 *.xcworkspace
 !default.xcworkspace
+.DS_Store
 
 # CocoaPods
 #
@@ -26,3 +27,6 @@ DerivedData
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
 Pods/
+
+# IntelliJ
+.idea/

.gitignore

@@ -2,6 +2,7 @@ use_frameworks!
 
 target 'TUSKit_Example' do
   pod 'TUSKit', :path => '../'
+  pod 'TLPhotoPicker'
 
   target 'TUSKit_Tests' do
     inherit! :search_paths

Example/.DS_Store

@@ -12,16 +12,16 @@ PODS:
     - FBSnapshotTestCase (~> 2.0)
     - Nimble (~> 7.0)
   - Quick (1.2.0)
-  - TLPhotoPicker (2.0.11)
-  - TUSKit (2.0.3.alpha):
-    - TLPhotoPicker
+  - TLPhotoPicker (2.1.3)
+  - TUSKit (2.0.0)
 
 DEPENDENCIES:
   - AppSpectorSDK
   - FBSnapshotTestCase (~> 2.1.4)
   - Nimble (~> 7.0)
   - Nimble-Snapshots (~> 6.3.0)
   - Quick (~> 1.2.0)
+  - TLPhotoPicker
   - TUSKit (from `../`)
 
 SPEC REPOS:
@@ -43,9 +43,9 @@ SPEC CHECKSUMS:
   Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
   Nimble-Snapshots: f5459b5b091678dc942d03ec4741cacb58ba4a52
   Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
-  TLPhotoPicker: a5c339732b8326bb16cbb4e00ed01a86f2bfbbb3
-  TUSKit: 23162a720b2e89c2cad7bc2397592bf8893cf64a
+  TLPhotoPicker: 2c4a20d62952bd368edbf44d18476f663a718ada
+  TUSKit: befb40e402aae1ee35a6b2b1edda26416bd0e473
 
-PODFILE CHECKSUM: 572a5d87651b95d2aa1ecdf921075dfd78b37d95
+PODFILE CHECKSUM: 56e9b6c1fa8da25eda882f2eaba8707f765eb8e1
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.1

Example/Podfile

@@ -10,106 +10,113 @@ import UIKit
 import TUSKit
 
 class ViewController: UIViewController, TUSDelegate, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-    
+
     let imagePicker = UIImagePickerController()
 
     @IBOutlet weak var numberOfFilesLabel: UILabel!
     @IBOutlet weak var progressLabel: UILabel!
     @IBOutlet weak var progressBar: UIProgressView!
     @IBOutlet weak var numberOfFilesUploadingLabel: UILabel!
     @IBOutlet weak var numberOfFileUploadLabel: UILabel!
-    
+
     var files: [URL] = []
     var numOfUploaded = 0
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
         //Image picker setup for example.
         imagePicker.sourceType = .photoLibrary
         imagePicker.delegate = self
-        
+
         //Set the deleagte of TUSClient
         TUSClient.shared.delegate = self
-        
-        
+
+
 //        if let path = Bundle.main.path(forResource: "test", ofType:"mp4") {
 //           let number = Int.random(in: 0 ..< 100) //TODO: Remove before release: this is only set so we can run multiple files while developer
 //            let upload: TUSUpload = TUSUpload(withId: String(format: "%@%@", "video", String(number)), andFilePathURL: URL(fileURLWithPath: path), andFileType: ".mp4")
 //                //Create or resume upload
 //
 //                TUSClient.shared.createOrResume(forUpload: upload)
 //        }
-        
+
     }
-    
+
     func updateLabel() {
         numberOfFilesLabel.text = "\(files.count) of files ready for upload"
         numberOfFilesUploadingLabel.text = "\(String(describing: TUSClient.shared.currentUploads!.count)) files uploading"
         numberOfFileUploadLabel.text = "\(numOfUploaded) files uploaded"
     }
-    
+
     @IBAction func addFileAction(_ sender: Any) {
         present(imagePicker, animated: true, completion: nil)
     }
-    
+
     @IBAction func uploadAction(_ sender: Any) {
+        if (TUSClient.shared.status == TUSClientStaus.ready
+                && TUSClient.shared.currentUploads!.count > 0
+                && files.count <= 0) {
+            TUSClient.shared.resumeAll()
+            return;
+        }
+
         for file in files {
             let number = Int.random(in: 0 ..< 1000) //TODO: Remove before release: this is only set so we can run multiple files while developer
-            
+
             //When you have a file, create an upload, and give it a Id.
-            var fileData = try! Data(contentsOf: file)
-            let upload: TUSUpload = TUSUpload(withId:  String(number), andData: fileData, andFileType: "jpeg")
+            let upload: TUSUpload = TUSUpload(withId:  String(number), andFilePathURL: file, andFileType: ".jpeg")
             upload.metadata = ["hello": "world"]
             //Create or resume upload
             TUSClient.shared.createOrResume(forUpload: upload, withCustomHeaders: ["Header": "Value"])
         }
         updateLabel()
     }
-    
-   
+
+
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
 
         if #available(iOS 11.0, *) {
             guard let imageURL = info[.imageURL] else {
                 return
             }
-            
+
             files.append(imageURL as! URL)
             updateLabel()
         }
-        
+
         dismiss(animated: true) {
         }
     }
 //
     func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
         dismiss(animated: true, completion: nil)
     }
-    
+
     //MARK: TUSClient Deleagte
-    
+
     func TUSProgress(bytesUploaded uploaded: Int, bytesRemaining remaining: Int) {
-        //
-        print(uploaded)
-               print(remaining)
+        print("Global upload: \(uploaded)/\(remaining)");
         self.progressLabel.text = "\(uploaded)/\(remaining)"
         self.progressBar.progress = Float(uploaded) / Float(remaining)
     }
-    
+
     func TUSProgress(forUpload upload: TUSUpload, bytesUploaded uploaded: Int, bytesRemaining remaining: Int) {
-        //
-        print(uploaded)
-        print(remaining)
+        print("Upload for: \(upload.id) \(uploaded)/\(remaining)");
     }
-    
+
     func TUSSuccess(forUpload upload: TUSUpload) {
         print(upload.uploadLocationURL)
         TUSClient.shared.getFile(forUpload: upload)
         numOfUploaded = numOfUploaded + 1
-        updateLabel()
+        // Delay the update a second, because we will get the pending uploads
+        // from TUS. After a upload has finished it may take some short amount of time after the
+        // persistence layer has been updated.
+        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+            self.updateLabel()
+        }
         //
     }
-    
+
     func TUSFailure(forUpload upload: TUSUpload?, withResponse response: TUSResponse?, andError error: Error?) {
         //
         if (response != nil) {

Example/Podfile.lock

@@ -156,3 +156,11 @@ The delegate method fire when a file stops (canceled, failure, or paused)
 ```Swift
 func TUSFailure(TUSUpload, TUSResponse)
 ```
+
+# Contributors 
+
+<a href="https://github.com/tus/tuskit/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=tus/tuskit" />
+</a>
+
+Made with [contributors-img](https://contrib.rocks).

Example/TUSKit/ViewController.swift

@@ -30,7 +30,7 @@ TODO: Add long description of the pod here.
   s.source           = { :git => 'https://github.com/tus/tus-ios-client.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
-  s.ios.deployment_target = '8.0'
+  s.ios.deployment_target = '8.2'
   s.osx.deployment_target = '10.10'
 
   s.source_files = 'TUSKit/Classes/**/*'

README.md

@@ -0,0 +1,23 @@
+//
+//  TUSBackgroundMode.swift
+//  TUSKit
+//
+//  Created by Hanno  Gödecke on 25.02.21.
+//
+
+import Foundation
+
+public enum TUSBackgroundMode: Int {
+    /// This tries to upload everything that is in the queue
+    /// even if the app goes into background. The problem is,
+    /// that the background processing can be shut down, so
+    /// the queue won't finish. In this case you need to
+    /// resume the queue on your own when the app is started again.
+    case PreferUploadQueue = 0
+    /// This is the default. It means that it tries to finish
+    /// the current upload task and then stop.
+    /// This is prefered, as its more likely to finish one upload
+    /// than the whole queue. Plus it is more battery friendly,
+    /// as the app will spend less time processing in the background.
+    case PreferFinishUpload = 1
+}