Merge pull request #738 from ParsePlatform/nlutsenko.files

Fixed not set url for new file uploads.

Author: nlutsenko

Parse/Internal/File/Controller/PFFileController.h

@@ -18,6 +18,7 @@
 @class BFTask<__covariant BFGenericType>;
 @class PFFileState;
 @class PFFileStagingController;
+@class PFFileDataStream;
 
 @interface PFFileController : NSObject
 
@@ -51,9 +52,9 @@
 
  @return `BFTask` with a result set to `nil`.
  */
-- (BFTask *)downloadFileAsyncWithState:(PFFileState *)fileState
-                     cancellationToken:(BFCancellationToken *)cancellationToken
-                         progressBlock:(PFProgressBlock)progressBlock;
+- (BFTask<PFVoid> *)downloadFileAsyncWithState:(PFFileState *)fileState
+                             cancellationToken:(BFCancellationToken *)cancellationToken
+                                 progressBlock:(PFProgressBlock)progressBlock;
 
 /**
  Downloads a file asynchronously with a given state and yields a stream to the live download of that file.
@@ -64,9 +65,9 @@
 
  @return `BFTask` with a result set to live `NSInputStream` of the file.
  */
-- (BFTask *)downloadFileStreamAsyncWithState:(PFFileState *)fileState
-                           cancellationToken:(BFCancellationToken *)cancellationToken
-                               progressBlock:(PFProgressBlock)progressBlock;
+- (BFTask<PFFileDataStream *> *)downloadFileStreamAsyncWithState:(PFFileState *)fileState
+                                               cancellationToken:(BFCancellationToken *)cancellationToken
+                                                   progressBlock:(PFProgressBlock)progressBlock;
 
 ///--------------------------------------
 #pragma mark - Upload
@@ -83,17 +84,17 @@
 
  @return `BFTask` with a result set to `PFFileState` of uploaded file.
  */
-- (BFTask *)uploadFileAsyncWithState:(PFFileState *)fileState
-                      sourceFilePath:(NSString *)sourceFilePath
-                        sessionToken:(NSString *)sessionToken
-                   cancellationToken:(BFCancellationToken *)cancellationToken
-                       progressBlock:(PFProgressBlock)progressBlock;
+- (BFTask<PFFileState *> *)uploadFileAsyncWithState:(PFFileState *)fileState
+                                     sourceFilePath:(NSString *)sourceFilePath
+                                       sessionToken:(NSString *)sessionToken
+                                  cancellationToken:(BFCancellationToken *)cancellationToken
+                                      progressBlock:(PFProgressBlock)progressBlock;
 
 ///--------------------------------------
 #pragma mark - Cache
 ///--------------------------------------
 
-- (BFTask *)clearFileCacheAsync;
+- (BFTask<PFVoid> *)clearFileCacheAsync;
 
 - (NSString *)cachedFilePathForFileState:(PFFileState *)fileState;
 

Parse/Internal/File/Controller/PFFileController.m

@@ -81,9 +81,9 @@ - (PFFileStagingController *)fileStagingController {
 #pragma mark - Download
 ///--------------------------------------
 
-- (BFTask *)downloadFileAsyncWithState:(PFFileState *)fileState
-                     cancellationToken:(BFCancellationToken *)cancellationToken
-                         progressBlock:(PFProgressBlock)progressBlock {
+- (BFTask<PFVoid> *)downloadFileAsyncWithState:(PFFileState *)fileState
+                             cancellationToken:(BFCancellationToken *)cancellationToken
+                                 progressBlock:(PFProgressBlock)progressBlock {
     if (cancellationToken.cancellationRequested) {
         return [BFTask cancelledTask];
     }
@@ -131,25 +131,25 @@ - (BFTask *)downloadFileAsyncWithState:(PFFileState *)fileState
     }];
 }
 
-- (BFTask *)downloadFileStreamAsyncWithState:(PFFileState *)fileState
-                           cancellationToken:(BFCancellationToken *)cancellationToken
-                               progressBlock:(PFProgressBlock)progressBlock {
+- (BFTask<PFFileDataStream *> *)downloadFileStreamAsyncWithState:(PFFileState *)fileState
+                                               cancellationToken:(BFCancellationToken *)cancellationToken
+                                                   progressBlock:(PFProgressBlock)progressBlock {
     return [BFTask taskFromExecutor:[BFExecutor defaultPriorityBackgroundExecutor] withBlock:^id{
-        BFTaskCompletionSource *taskCompletionSource = [BFTaskCompletionSource taskCompletionSource];
+        BFTaskCompletionSource<PFFileDataStream *> *taskCompletionSource = [BFTaskCompletionSource taskCompletionSource];
         NSString *filePath = [self _temporaryFileDownloadPathForFileState:fileState];
         PFFileDataStream *stream = [[PFFileDataStream alloc] initWithFileAtPath:filePath];
         [[self downloadFileAsyncWithState:fileState
-                       cancellationToken:cancellationToken
-                           progressBlock:^(int percentDone) {
-                               [taskCompletionSource trySetResult:stream];
-
-                               if (progressBlock) {
-                                   progressBlock(percentDone);
-                               }
-                           }] continueWithBlock:^id(BFTask *task) {
-                               [stream stopBlocking];
-                               return task;
-                           }];
+                        cancellationToken:cancellationToken
+                            progressBlock:^(int percentDone) {
+                                [taskCompletionSource trySetResult:stream];
+
+                                if (progressBlock) {
+                                    progressBlock(percentDone);
+                                }
+                            }] continueWithBlock:^id(BFTask *task) {
+                                [stream stopBlocking];
+                                return task;
+                            }];
         return taskCompletionSource.task;
     }];
 }
@@ -204,11 +204,11 @@ - (NSString *)_temporaryFileDownloadPathForFileState:(PFFileState *)fileState {
 #pragma mark - Upload
 ///--------------------------------------
 
-- (BFTask *)uploadFileAsyncWithState:(PFFileState *)fileState
-                      sourceFilePath:(NSString *)sourceFilePath
-                        sessionToken:(NSString *)sessionToken
-                   cancellationToken:(BFCancellationToken *)cancellationToken
-                       progressBlock:(PFProgressBlock)progressBlock {
+- (BFTask<PFFileState *> *)uploadFileAsyncWithState:(PFFileState *)fileState
+                                     sourceFilePath:(NSString *)sourceFilePath
+                                       sessionToken:(NSString *)sessionToken
+                                  cancellationToken:(BFCancellationToken *)cancellationToken
+                                      progressBlock:(PFProgressBlock)progressBlock {
     if (cancellationToken.cancellationRequested) {
         return [BFTask cancelledTask];
     }
@@ -220,20 +220,18 @@ - (BFTask *)uploadFileAsyncWithState:(PFFileState *)fileState
 
     PFRESTFileCommand *command = [PFRESTFileCommand uploadCommandForFileWithName:fileState.name sessionToken:sessionToken];
     @weakify(self);
-    return [[[self.dataSource.commandRunner runFileUploadCommandAsync:command
-                                                      withContentType:fileState.mimeType
-                                                contentSourceFilePath:sourceFilePath
-                                                              options:PFCommandRunningOptionRetryIfFailed
-                                                    cancellationToken:cancellationToken
-                                                        progressBlock:progressBlock] continueWithSuccessBlock:^id(BFTask *task) {
+    return [[self.dataSource.commandRunner runFileUploadCommandAsync:command
+                                                     withContentType:fileState.mimeType
+                                               contentSourceFilePath:sourceFilePath
+                                                             options:PFCommandRunningOptionRetryIfFailed
+                                                   cancellationToken:cancellationToken
+                                                       progressBlock:progressBlock] continueWithSuccessBlock:^id(BFTask<PFCommandResult *> *task) {
+        @strongify(self);
         PFCommandResult *result = task.result;
         PFFileState *fileState = [[PFFileState alloc] initWithName:result.result[@"name"]
                                                          urlString:result.result[@"url"]
                                                           mimeType:nil];
-        return fileState;
-    }] continueWithSuccessBlock:^id(BFTask<PFFileState *> *task) {
-        @strongify(self);
-        return [self _cacheFileAsyncWithState:task.result atPath:sourceFilePath];
+        return [[self _cacheFileAsyncWithState:fileState atPath:sourceFilePath] continueWithSuccessResult:fileState];
     }];
 }
 
@@ -261,7 +259,7 @@ - (NSString *)cacheFilesDirectoryPath {
     return [self.dataSource.fileManager parseCacheItemPathForPathComponent:PFFileControllerCacheDirectoryName_];
 }
 
-- (BFTask *)clearFileCacheAsync {
+- (BFTask<PFVoid> *)clearFileCacheAsync {
     return [BFTask taskFromExecutor:[BFExecutor defaultExecutor] withBlock:^id{
         NSString *path = self.cacheFilesDirectoryPath;
         if ([[NSFileManager defaultManager] fileExistsAtPath:path]) {

Tests/Unit/FileControllerTests.m

@@ -440,8 +440,9 @@ - (void)testUpload {
                                 progressBlock:^(int percentDone) {
                                     XCTAssertTrue(progress <= percentDone);
                                     progress = percentDone;
-                                }] continueWithBlock:^id(BFTask *task) {
-                                    XCTAssertNil(task.error);
+                                }] continueWithBlock:^id(BFTask<PFFileState *> *task) {
+                                    XCTAssertNotNil(task.result);
+                                    XCTAssertEqualObjects(task.result.urlString, tempPath.absoluteString);
                                     [expectation fulfill];
                                     return nil;
                                 }];