add relative to URL, and make all headers Uppercase

tus · May 5, 2020 · 4d5ba5d · 4d5ba5d
1 parent 3ac9418
commit 4d5ba5d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Example/TUSKit.xcodeproj/project.pbxproj b/Example/TUSKit.xcodeproj/project.pbxproj
@@ -29,7 +29,7 @@
 
 /* Begin PBXFileReference section */
 		178E27EB1EA228D2A68B13FE /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
-		20578BE9B2C33456E6BC8985 /* TUSKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = TUSKit.podspec; path = ../TUSKit.podspec; sourceTree = "<group>"; };
+		20578BE9B2C33456E6BC8985 /* TUSKit.podspec */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = TUSKit.podspec; path = ../TUSKit.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
 		40C0ABED9802BD92047C4052 /* Pods-TUSKit_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TUSKit_Tests.debug.xcconfig"; path = "Target Support Files/Pods-TUSKit_Tests/Pods-TUSKit_Tests.debug.xcconfig"; sourceTree = "<group>"; };
 		607FACD01AFB9204008FA782 /* TUSKit_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TUSKit_Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		607FACD41AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };

diff --git a/TUSKit.podspec b/TUSKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TUSKit'
-  s.version          = '2.0.1.alpha'
+  s.version          = '2.0.2.alpha'
   s.summary          = 'A rewrite of TUSKit, in Swift'
   s.swift_version = '5.0'
 

diff --git a/TUSKit/Classes/HTTPURLResponse+allHeadersUpper.swift b/TUSKit/Classes/HTTPURLResponse+allHeadersUpper.swift
@@ -0,0 +1,21 @@
+//
+//  HTTPURLResponse+allHeadersUpper.swift
+//  TUSKit
+//
+//  Created by Mark Robert Masterson on 5/5/20.
+//
+
+import Foundation
+
+extension HTTPURLResponse {
+
+    func allHeaderFieldsUpper() -> Dictionary<String, String> {
+        var newHeaders = Dictionary<String, String>()
+        for item in self.allHeaderFields {
+            let key = item.key as! String
+            newHeaders[key.uppercased()] = (item.value as! String)
+        }
+        return newHeaders
+    }
+
+}
diff --git a/TUSKit/Classes/TUSExecutor.swift b/TUSKit/Classes/TUSExecutor.swift
@@ -43,7 +43,7 @@ class TUSExecutor: NSObject, URLSessionDelegate {
                     // Set the new status and other props for the upload
                     upload.status = .created
 //                    upload.contentLength = httpResponse.allHeaderFields["Content-Length"] as? String
-                    upload.uploadLocationURL = URL(string: httpResponse.allHeaderFields["Location"] as! String)
+                    upload.uploadLocationURL = URL(string: httpResponse.allHeaderFieldsUpper()["LOCATION"]!, relativeTo: TUSClient.shared.uploadURL)
                     //Begin the upload
                     self.upload(forUpload: upload)
                 }
@@ -79,7 +79,8 @@ class TUSExecutor: NSObject, URLSessionDelegate {
                 case 200..<300:
                     //success
                     if (chunks.count > position+1 ){
-                        upload.uploadOffset = httpResponse.allHeaderFields["upload-offset"] as! String
+
+                        upload.uploadOffset = httpResponse.allHeaderFieldsUpper()["UPLOAD-OFFSET"]
                         self.upload(forChunks: chunks, withUpload: upload, atPosition: position+1)
                     } else
                     if (httpResponse.statusCode == 204) {