Merge pull request #727 from ParsePlatform/nlutsenko.filesize

Improve content-length calculation for file upload requests.

Author: nlutsenko

Parse/Internal/Commands/CommandRunner/URLRequestConstructor/PFCommandURLRequestConstructor.m

@@ -99,9 +99,16 @@ + (instancetype)constructorWithDataSource:(id<PFInstallationIdentifierStoreProvi
             [request setValue:contentType forHTTPHeaderField:PFHTTPRequestHeaderNameContentType];
         }
 
-        //TODO (nlutsenko): Check for error here.
-        NSNumber *fileSize = [PFInternalUtils fileSizeOfFileAtPath:contentFilePath error:nil];
-        [request setValue:fileSize.stringValue forHTTPHeaderField:PFHTTPRequestHeaderNameContentLength];
+        NSURL *fileURL = [NSURL fileURLWithPath:contentFilePath];
+        NSNumber *fileSize = nil;
+        NSError *error = nil;
+        [fileURL getResourceValue:&fileSize forKey:NSURLFileSizeKey error:&error];
+        if (error) {
+            return [BFTask taskWithError:error];
+        }
+        if (fileSize) {
+            [request setValue:fileSize.stringValue forHTTPHeaderField:PFHTTPRequestHeaderNameContentLength];
+        }
 
         return request;
     }];

Parse/Internal/PFInternalUtils.h

@@ -22,8 +22,6 @@
 + (NSString *)parseServerURLString;
 + (void)setParseServer:(NSString *)server;
 
-+ (NSNumber *)fileSizeOfFileAtPath:(NSString *)filePath error:(NSError **)error;
-
 /**
  Clears system time zone cache, gets the name of the time zone
  and caches it. This method is completely thread-safe.

Parse/Internal/PFInternalUtils.m

@@ -86,12 +86,6 @@ + (void)safePerformSelector:(SEL)selector withTarget:(id)target object:(id)objec
 #pragma clang diagnostic pop
 }
 
-+ (NSNumber *)fileSizeOfFileAtPath:(NSString *)filePath error:(NSError **)error {
-    NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath
-                                                                                error:error];
-    return attributes[NSFileSize];
-}
-
 ///--------------------------------------
 #pragma mark - Serialization
 ///--------------------------------------