github/cordova-plugin-file-transfer
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-file-transfer.git synced 2026-04-28 00:02:49 +08:00
Code Issues Projects Releases Wiki Activity

iOS: Fix error where files were not removed on abort

Browse Source
This commit is contained in:
Ian Clelland
2014-03-28 10:36:01 -04:00
parent 223d08626d
commit 2309e0e76c
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ios/CDVFileTransfer.m
+21 -15
View File
@@ -587,7 +587,7 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
{ {
NSFileManager* fileMgr = [NSFileManager defaultManager]; NSFileManager* fileMgr = [NSFileManager defaultManager];
[fileMgr removeItemAtPath:self.target error:nil]; [fileMgr removeItemAtPath:[self targetFilePath] error:nil];
} }
- (void)cancelTransfer:(NSURLConnection*)connection - (void)cancelTransfer:(NSURLConnection*)connection
@@ -612,6 +612,21 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
[self.command.commandDelegate sendPluginResult:result callbackId:callbackId]; [self.command.commandDelegate sendPluginResult:result callbackId:callbackId];
} }
- (NSString *)targetFilePath
{
NSString *path = nil;
CDVFilesystemURL *sourceURL = [CDVFilesystemURL fileSystemURLWithString:self.target];
if (sourceURL && sourceURL.fileSystemName != nil) {
// This requires talking to the current CDVFile plugin
NSObject<CDVFileSystem> *fs = [self.filePlugin filesystemForURL:sourceURL];
path = [fs filesystemPathForURL:sourceURL];
} else {
// Extract the path part out of a file: URL.
path = [self.target hasPrefix:@"/"] ? [self.target copy] : [(NSURL *)[NSURL URLWithString:self.target] path];
}
return path;
}
- (void)connection:(NSURLConnection*)connection didReceiveResponse:(NSURLResponse*)response - (void)connection:(NSURLConnection*)connection didReceiveResponse:(NSURLResponse*)response
{ {
NSError* __autoreleasing error = nil; NSError* __autoreleasing error = nil;
@@ -642,20 +657,11 @@ static CFIndex WriteDataToStream(NSData* data, CFWriteStreamRef stream)
} }
if ((self.direction == CDV_TRANSFER_DOWNLOAD) && (self.responseCode >= 200) && (self.responseCode < 300)) { if ((self.direction == CDV_TRANSFER_DOWNLOAD) && (self.responseCode >= 200) && (self.responseCode < 300)) {
// Download response is okay; begin streaming output to file // Download response is okay; begin streaming output to file
NSString *filePath = nil; NSString *filePath = [self targetFilePath];
CDVFilesystemURL *sourceURL = [CDVFilesystemURL fileSystemURLWithString:self.target]; if (filePath == nil) {
if (sourceURL && sourceURL.fileSystemName != nil) { // We couldn't find the asset. Send the appropriate error.
// This requires talking to the current CDVFile plugin [self cancelTransferWithError:connection errorMessage:[NSString stringWithFormat:@"Could not create target file"]];
NSObject<CDVFileSystem> *fs = [self.filePlugin filesystemForURL:sourceURL]; return;
filePath = [fs filesystemPathForURL:sourceURL];
} else {
// Extract the path part out of a file: URL.
NSString* filePath = [self.target hasPrefix:@"/"] ? [self.target copy] : [(NSURL *)[NSURL URLWithString:self.target] path];
if (filePath == nil) {
// We couldn't find the asset. Send the appropriate error.
[self cancelTransferWithError:connection errorMessage:[NSString stringWithFormat:@"Could not create target file"]];
return;
}
} }
NSString* parentPath = [filePath stringByDeletingLastPathComponent]; NSString* parentPath = [filePath stringByDeletingLastPathComponent];