status-im
/
react-native-fs
mirror of https://github.com/status-im/react-native-fs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Finish migrating non-background downloads to the NSURLSession API

This commit is contained in:
Aaron Franks 2016-05-26 12:46:06 -07:00 committed by Chris Dell
parent 87149c2b57
commit a424e4e70d
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Downloader.m
View File

@ -32,9 +32,12 @@
_fileHandle = [NSFileHandle fileHandleForWritingAtPath:_params.toFile]; _fileHandle = [NSFileHandle fileHandleForWritingAtPath:_params.toFile];
if (!_fileHandle) { if (!_fileHandle) {
NSError* error = [NSError errorWithDomain:@"Downloader" code:NSURLErrorFileDoesNotExist userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat: @"Failed to create target file at path: %@", _params.toFile]}]; NSError* error = [NSError errorWithDomain:@"Downloader" code:NSURLErrorFileDoesNotExist
userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat: @"Failed to create target file at path: %@", _params.toFile]}];
return _params.errorCallback(error); return _params.errorCallback(error);
} else {
[_fileHandle closeFile];
} }
NSURLSessionConfiguration *config; NSURLSessionConfiguration *config;
@ -47,36 +50,37 @@
[_task resume]; [_task resume];
} }
- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didReceiveResponse:(NSURLResponse *)response - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
{ {
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)downloadTask.response; NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)downloadTask.response;
_statusCode = [NSNumber numberWithLong:httpResponse.statusCode]; if (!_statusCode) {
_contentLength = [NSNumber numberWithLong:httpResponse.expectedContentLength]; _statusCode = [NSNumber numberWithLong:httpResponse.statusCode];
_contentLength = [NSNumber numberWithLong:httpResponse.expectedContentLength];
return _params.beginCallback(_statusCode, _contentLength, httpResponse.allHeaderFields);
}
return _params.beginCallback(_statusCode, _contentLength, httpResponse.allHeaderFields);
}
- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(NSData *)data
{
if ([_statusCode isEqualToNumber:[NSNumber numberWithInt:200]]) { if ([_statusCode isEqualToNumber:[NSNumber numberWithInt:200]]) {
[_fileHandle writeData:data]; _bytesWritten = @(totalBytesWritten);
_bytesWritten = [NSNumber numberWithUnsignedInteger:[_bytesWritten unsignedIntegerValue] + data.length];
return _params.progressCallback(_contentLength, _bytesWritten); return _params.progressCallback(_contentLength, _bytesWritten);
} }
} }
- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
{ {
[_fileHandle closeFile]; NSURL *destURL = [NSURL fileURLWithPath:_params.toFile];
NSFileManager *fm = [NSFileManager defaultManager];
NSError *error = nil;
[fm removeItemAtURL:destURL error:nil]; // Remove file at destination path, if it exists
[fm moveItemAtURL:location toURL:destURL error:&error];
if (error) {
NSLog(@"RNFS download: unable to move tempfile to destination. %@, %@", error, error.userInfo);
}
return _params.completeCallback(_statusCode, _bytesWritten); return _params.completeCallback(_statusCode, _bytesWritten);
} }
- (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionTask *)downloadTask didCompleteWithError:(NSError *)error - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionTask *)downloadTask didCompleteWithError:(NSError *)error
{ {
[_fileHandle closeFile];
return _params.errorCallback(error); return _params.errorCallback(error);
} }