Changed resume progress behaviour so that the resumed part of a download is incl…

…uded in the progress update
Removed sharedNetworkQueue - thinking about it, this is potentially dangerous

@@ -122,6 +122,9 @@ typedef enum _ASINetworkErrorType {
 	// Size of the response
 	// Size of the response
 	unsigned long long contentLength;
 	unsigned long long contentLength;
 	
 	
+	// Size of the partially downloaded content
+	unsigned long long partialDownloadSize;
+	
 	// Size of the POST payload
 	// Size of the POST payload
 	unsigned long long postLength;	
 	unsigned long long postLength;	
 	
 	
@@ -335,6 +338,7 @@ typedef enum _ASINetworkErrorType {
 @property (retain) NSString *requestMethod;
 @property (retain) NSString *requestMethod;
 @property (retain,setter=setPostBody:) NSData *postBody;
 @property (retain,setter=setPostBody:) NSData *postBody;
 @property (assign) unsigned long long contentLength;
 @property (assign) unsigned long long contentLength;
+@property (assign) unsigned long long partialDownloadSize;
 @property (assign) unsigned long long postLength;
 @property (assign) unsigned long long postLength;
 @property (assign) BOOL shouldResetProgressIndicators;
 @property (assign) BOOL shouldResetProgressIndicators;
 @property (retain) ASIHTTPRequest *mainRequest;
 @property (retain) ASIHTTPRequest *mainRequest;

@@ -79,6 +79,8 @@ static NSError *ASIUnableToCreateRequestError;
 	[self setAllowCompressedResponse:YES];
 	[self setAllowCompressedResponse:YES];
 	[self setDefaultResponseEncoding:NSISOLatin1StringEncoding];
 	[self setDefaultResponseEncoding:NSISOLatin1StringEncoding];
 	[self setUploadBufferSize:0];
 	[self setUploadBufferSize:0];
+	[self setContentLength:0];
+	[self setPartialDownloadSize:0];
 	[self setResponseHeaders:nil];
 	[self setResponseHeaders:nil];
 	[self setTimeOutSeconds:10];
 	[self setTimeOutSeconds:10];
 	[self setAllowResumeForFileDownloads:NO];
 	[self setAllowResumeForFileDownloads:NO];
@@ -277,8 +279,8 @@ static NSError *ASIUnableToCreateRequestError;
 	
 	
 	// Should this request resume an existing download?
 	// Should this request resume an existing download?
 	if ([self allowResumeForFileDownloads] && [self downloadDestinationPath] && [self temporaryFileDownloadPath] && [[NSFileManager defaultManager] fileExistsAtPath:[self temporaryFileDownloadPath]]) {
 	if ([self allowResumeForFileDownloads] && [self downloadDestinationPath] && [self temporaryFileDownloadPath] && [[NSFileManager defaultManager] fileExistsAtPath:[self temporaryFileDownloadPath]]) {
-		unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] fileAttributesAtPath:[self temporaryFileDownloadPath] traverseLink:NO] fileSize];
-		[self addRequestHeader:@"Range" value:[NSString stringWithFormat:@"bytes=%llu-",downloadedSoFar]];
+		[self setPartialDownloadSize:[[[NSFileManager defaultManager] fileAttributesAtPath:[self temporaryFileDownloadPath] traverseLink:NO] fileSize]];
+		[self addRequestHeader:@"Range" value:[NSString stringWithFormat:@"bytes=%llu-",partialDownloadSize]];
 	}
 	}
 	
 	
 	// Add custom headers
 	// Add custom headers
@@ -622,7 +624,7 @@ static NSError *ASIUnableToCreateRequestError;
 	// We won't update download progress until we've examined the headers, since we might need to authenticate
 	// We won't update download progress until we've examined the headers, since we might need to authenticate
 	if (responseHeaders) {
 	if (responseHeaders) {
 		
 		
-		unsigned long long bytesReadSoFar = totalBytesRead;
+		unsigned long long bytesReadSoFar = totalBytesRead+partialDownloadSize;
 		
 		
 		if (bytesReadSoFar > lastBytesRead) {
 		if (bytesReadSoFar > lastBytesRead) {
 			[self setLastActivityTime:[NSDate date]];
 			[self setLastActivityTime:[NSDate date]];
@@ -644,8 +646,6 @@ static NSError *ASIUnableToCreateRequestError;
 					updatedProgress = YES;
 					updatedProgress = YES;
 				}
 				}
 				
 				
-				
-				
 				SEL selector = @selector(incrementDownloadProgressBy:);
 				SEL selector = @selector(incrementDownloadProgressBy:);
 				NSMethodSignature *signature = [[downloadProgressDelegate class] instanceMethodSignatureForSelector:selector];
 				NSMethodSignature *signature = [[downloadProgressDelegate class] instanceMethodSignatureForSelector:selector];
 				NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
 				NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -658,7 +658,7 @@ static NSError *ASIUnableToCreateRequestError;
 				
 				
 				// We aren't using a queue, we should just set progress of the indicator to 0
 				// We aren't using a queue, we should just set progress of the indicator to 0
 			} else if (contentLength > 0)  {
 			} else if (contentLength > 0)  {
-				[ASIHTTPRequest setProgress:(double)(1.0*bytesReadSoFar/contentLength) forProgressIndicator:downloadProgressDelegate];
+				[ASIHTTPRequest setProgress:(double)(1.0*bytesReadSoFar/(contentLength+partialDownloadSize)) forProgressIndicator:downloadProgressDelegate];
 			}
 			}
 		}
 		}
 		
 		
@@ -789,7 +789,7 @@ static NSError *ASIUnableToCreateRequestError;
 					[mainRequest setContentLength:contentLength];
 					[mainRequest setContentLength:contentLength];
 				}
 				}
 				if (downloadProgressDelegate && showAccurateProgress && shouldResetProgressIndicators) {
 				if (downloadProgressDelegate && showAccurateProgress && shouldResetProgressIndicators) {
-					[self resetDownloadProgress:contentLength];
+					[self resetDownloadProgress:contentLength+partialDownloadSize];
 				}
 				}
 			}
 			}
 			
 			
@@ -1453,6 +1453,7 @@ static NSError *ASIUnableToCreateRequestError;
 @synthesize requestMethod;
 @synthesize requestMethod;
 @synthesize postBody;
 @synthesize postBody;
 @synthesize contentLength;
 @synthesize contentLength;
+@synthesize partialDownloadSize;
 @synthesize postLength;
 @synthesize postLength;
 @synthesize shouldResetProgressIndicators;
 @synthesize shouldResetProgressIndicators;
 @synthesize mainRequest;
 @synthesize mainRequest;

@@ -83,8 +83,6 @@
 // This method will start the queue
 // This method will start the queue
 - (void)go;
 - (void)go;
 
 
-// A globally available network queue, created the first time it is requested
-+ (ASINetworkQueue *)sharedNetworkQueue;
 
 
 @property (assign,setter=setUploadProgressDelegate:) id uploadProgressDelegate;
 @property (assign,setter=setUploadProgressDelegate:) id uploadProgressDelegate;
 @property (assign,setter=setDownloadProgressDelegate:) id downloadProgressDelegate;
 @property (assign,setter=setDownloadProgressDelegate:) id downloadProgressDelegate;

@@ -140,13 +140,6 @@ static ASINetworkQueue *sharedNetworkQueue = nil;
 			if ([[request requestMethod] isEqualToString:@"GET"]) {
 			if ([[request requestMethod] isEqualToString:@"GET"]) {
 				ASIHTTPRequest *HEADRequest = [[[ASIHTTPRequest alloc] initWithURL:[request url]] autorelease];
 				ASIHTTPRequest *HEADRequest = [[[ASIHTTPRequest alloc] initWithURL:[request url]] autorelease];
 				[HEADRequest setMainRequest:request];
 				[HEADRequest setMainRequest:request];
-				
-				//If we're downloading to a file, and we already have a partial download to start from
-				if ([request allowResumeForFileDownloads] && [request downloadDestinationPath] && [request temporaryFileDownloadPath] && [[NSFileManager defaultManager] fileExistsAtPath:[request temporaryFileDownloadPath]]) {
-					unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] fileAttributesAtPath:[request temporaryFileDownloadPath] traverseLink:NO] fileSize];
-					[HEADRequest addRequestHeader:@"Range" value:[NSString stringWithFormat:@"bytes=%llu-",downloadedSoFar]];
-				}
-				
 				[self addHEADOperation:HEADRequest];
 				[self addHEADOperation:HEADRequest];
 				
 				
 				//Tell the request not to reset the progress indicator when it gets a content-length, as we will get the length from the HEAD request
 				//Tell the request not to reset the progress indicator when it gets a content-length, as we will get the length from the HEAD request
@@ -289,13 +282,6 @@ static ASINetworkQueue *sharedNetworkQueue = nil;
 }
 }
 
 
 
 
-+ (ASINetworkQueue *)sharedNetworkQueue
-{
-	if (!sharedNetworkQueue) {
-		sharedNetworkQueue = [[ASINetworkQueue alloc] init];
-	}
-	return sharedNetworkQueue;
-}
 
 
 
 
 @synthesize uploadProgressDelegate;
 @synthesize uploadProgressDelegate;

@@ -11,7 +11,6 @@
 
 
 @implementation ASIFormDataRequestTests
 @implementation ASIFormDataRequestTests
 
 
-
 - (void)testPostWithFileUpload
 - (void)testPostWithFileUpload
 {
 {
 	NSURL *url = [NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/post"];
 	NSURL *url = [NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/tests/post"];

@@ -511,12 +511,15 @@
 	NSString *partialContent = @"This file should be exactly 163 bytes long when encoded as UTF8, Unix line breaks with no BOM.\n";
 	NSString *partialContent = @"This file should be exactly 163 bytes long when encoded as UTF8, Unix line breaks with no BOM.\n";
 	[partialContent writeToFile:tempPath atomically:NO encoding:NSASCIIStringEncoding error:nil];
 	[partialContent writeToFile:tempPath atomically:NO encoding:NSASCIIStringEncoding error:nil];
 	
 	
+	progress = 0;
 	NSURL *url = [[[NSURL alloc] initWithString:@"http://allseeing-i.com/ASIHTTPRequest/Tests/test_partial_download.txt"] autorelease];
 	NSURL *url = [[[NSURL alloc] initWithString:@"http://allseeing-i.com/ASIHTTPRequest/Tests/test_partial_download.txt"] autorelease];
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
 	[request setDownloadDestinationPath:downloadPath];
 	[request setDownloadDestinationPath:downloadPath];
 	[request setTemporaryFileDownloadPath:tempPath];
 	[request setTemporaryFileDownloadPath:tempPath];
 	[request setAllowResumeForFileDownloads:YES];
 	[request setAllowResumeForFileDownloads:YES];
+	[request setDownloadProgressDelegate:self];
 	[request start];
 	[request start];
+
 	
 	
 	BOOL success = ([request contentLength] == 68);
 	BOOL success = ([request contentLength] == 68);
 	GHAssertTrue(success,@"Failed to download a segment of the data");
 	GHAssertTrue(success,@"Failed to download a segment of the data");
@@ -527,6 +530,9 @@
 	success = ([newPartialContent isEqualToString:@"This is the content we ought to be getting if we start from byte 95."]);
 	success = ([newPartialContent isEqualToString:@"This is the content we ought to be getting if we start from byte 95."]);
 	GHAssertTrue(success,@"Failed to append the correct data to the end of the file?");
 	GHAssertTrue(success,@"Failed to append the correct data to the end of the file?");
 	
 	
+	success = (progress == 1);
+	GHAssertTrue(success,@"Failed to correctly display increment progress for a partial download");
 }
 }
 
 
+
 @end
 @end

@@ -13,8 +13,6 @@
 @implementation ASINetworkQueueTests
 @implementation ASINetworkQueueTests
 
 
 
 
-static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMode");
-
 - (void)testProgress
 - (void)testProgress
 {
 {
 	complete = NO;
 	complete = NO;
@@ -40,10 +38,10 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	[networkQueue addOperation:request3];
 	[networkQueue addOperation:request3];
 	
 	
 	[networkQueue go];
 	[networkQueue go];
-	
-	while (!complete) {
-		CFRunLoopRunInMode(ASIHTTPRequestTestsRunMode,0.25,YES);
-	}
+		
+	 while (!complete) {
+		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
+	 }
 	
 	
 	BOOL success = (progress == 1.0);
 	BOOL success = (progress == 1.0);
 	GHAssertTrue(success,@"Failed to increment progress properly");
 	GHAssertTrue(success,@"Failed to increment progress properly");
@@ -80,7 +78,7 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	
 	
 }
 }
 
 
- 
+
 
 
 - (void)setProgress:(float)newProgress
 - (void)setProgress:(float)newProgress
 {
 {
@@ -213,6 +211,7 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 }
 }
 
 
 
 
+
 - (void)testProgressWithAuthentication
 - (void)testProgressWithAuthentication
 {
 {
 	complete = NO;
 	complete = NO;
@@ -234,7 +233,7 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	
 	
 
 
 	while (!complete) {
 	while (!complete) {
-		CFRunLoopRunInMode(ASIHTTPRequestTestsRunMode,0.25,YES);
+		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
 	}
 	}
 
 
 	NSError *error = [request error];
 	NSError *error = [request error];
@@ -256,7 +255,7 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	[networkQueue go];
 	[networkQueue go];
 	
 	
 	while (!complete) {
 	while (!complete) {
-		CFRunLoopRunInMode(ASIHTTPRequestTestsRunMode,0.25,YES);
+		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
 	}
 	}
 	
 	
 	error = [request error];
 	error = [request error];
@@ -265,6 +264,8 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	
 	
 }
 }
 
 
+
+
 - (void)requestFailedExpectedly:(ASIHTTPRequest *)request
 - (void)requestFailedExpectedly:(ASIHTTPRequest *)request
 {
 {
     request_didfail = YES;
     request_didfail = YES;
@@ -306,6 +307,7 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 - (void)testPartialResume
 - (void)testPartialResume
 {
 {
 	complete = NO;
 	complete = NO;
+	progress = 0;
 	
 	
 	NSString *temporaryPath = [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip.download"];
 	NSString *temporaryPath = [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip.download"];
 	if ([[NSFileManager defaultManager] fileExistsAtPath:temporaryPath]) {
 	if ([[NSFileManager defaultManager] fileExistsAtPath:temporaryPath]) {
@@ -339,8 +341,13 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	
 	
 	[networkQueue release];
 	[networkQueue release];
 	networkQueue = [[ASINetworkQueue alloc] init];
 	networkQueue = [[ASINetworkQueue alloc] init];
+	[networkQueue setDownloadProgressDelegate:self];
+	[networkQueue setShowAccurateProgress:YES];
+	[networkQueue setDelegate:self];
+	[networkQueue setQueueDidFinishSelector:@selector(queueFinished:)];	
 	
 	
-	
+	complete = NO;
+	progress = 0;	
 	unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] fileAttributesAtPath:temporaryPath traverseLink:NO] fileSize];
 	unsigned long long downloadedSoFar = [[[NSFileManager defaultManager] fileAttributesAtPath:temporaryPath traverseLink:NO] fileSize];
 	BOOL success = (downloadedSoFar > 0);
 	BOOL success = (downloadedSoFar > 0);
 	GHAssertTrue(success,@"Failed to download part of the file, so we can't proceed with this test");
 	GHAssertTrue(success,@"Failed to download part of the file, so we can't proceed with this test");
@@ -351,14 +358,19 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 	[request setAllowResumeForFileDownloads:YES];
 	[request setAllowResumeForFileDownloads:YES];
 	
 	
 	[networkQueue addOperation:request];
 	[networkQueue addOperation:request];
+
 	[networkQueue go];
 	[networkQueue go];
-	
-	[networkQueue waitUntilAllOperationsAreFinished];
+
+	while (!complete) {
+		[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
+	}
 	
 	
 	unsigned long long amountDownloaded = [[[NSFileManager defaultManager] fileAttributesAtPath:downloadPath traverseLink:NO] fileSize];
 	unsigned long long amountDownloaded = [[[NSFileManager defaultManager] fileAttributesAtPath:downloadPath traverseLink:NO] fileSize];
 	success = (amountDownloaded == 9145357);
 	success = (amountDownloaded == 9145357);
 	GHAssertTrue(success,@"Failed to complete the download");
 	GHAssertTrue(success,@"Failed to complete the download");
 	
 	
+	success = (progress == 1.0);
+	GHAssertTrue(success,@"Failed to increment progress properly");
 	
 	
 	[networkQueue release];
 	[networkQueue release];
 	
 	
@@ -372,4 +384,5 @@ static CFStringRef ASIHTTPRequestTestsRunMode = CFSTR("ASIHTTPRequestTestsRunMod
 }
 }
 
 
 
 
+ 
 @end
 @end

@@ -29,11 +29,15 @@
 	IBOutlet NSImageView *imageView1;
 	IBOutlet NSImageView *imageView1;
 	IBOutlet NSImageView *imageView2;
 	IBOutlet NSImageView *imageView2;
 	IBOutlet NSImageView *imageView3;
 	IBOutlet NSImageView *imageView3;
+	
+	IBOutlet NSButton *startButton;
+	IBOutlet NSButton *resumeButton;
 }
 }
 
 
 - (IBAction)simpleURLFetch:(id)sender;
 - (IBAction)simpleURLFetch:(id)sender;
 - (IBAction)URLFetchWithProgress:(id)sender;
 - (IBAction)URLFetchWithProgress:(id)sender;
-
+- (IBAction)stopURLFetchWithProgress:(id)sender;
+- (IBAction)resumeURLFetchWithProgress:(id)sender;
 
 
 - (IBAction)fetchThreeImages:(id)sender;
 - (IBAction)fetchThreeImages:(id)sender;
 
 

@@ -42,6 +42,32 @@
 
 
 - (IBAction)URLFetchWithProgress:(id)sender
 - (IBAction)URLFetchWithProgress:(id)sender
 {
 {
+	[startButton setTitle:@"Stop"];
+	[startButton setAction:@selector(stopURLFetchWithProgress:)];
+	
+	NSString *tempFile = [[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip.download"];
+	if ([[NSFileManager defaultManager] fileExistsAtPath:tempFile]) {
+		[[NSFileManager defaultManager] removeItemAtPath:tempFile error:nil];
+	}
+	
+	[self resumeURLFetchWithProgress:self];
+}
+
+
+- (IBAction)stopURLFetchWithProgress:(id)sender
+{
+	[startButton setTitle:@"Start"];
+	[startButton setAction:@selector(URLFetchWithProgress:)];
+	[networkQueue cancelAllOperations];
+	[resumeButton setEnabled:YES];
+}
+
+- (IBAction)resumeURLFetchWithProgress:(id)sender
+{
+	[resumeButton setEnabled:NO];
+	[startButton setTitle:@"Stop"];
+	[startButton setAction:@selector(stopURLFetchWithProgress:)];
+	
 	[networkQueue cancelAllOperations];
 	[networkQueue cancelAllOperations];
 	[networkQueue setShowAccurateProgress:YES];
 	[networkQueue setShowAccurateProgress:YES];
 	[networkQueue setDownloadProgressDelegate:progressIndicator];
 	[networkQueue setDownloadProgressDelegate:progressIndicator];
@@ -50,6 +76,8 @@
 	
 	
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://trails-network.net/Downloads/MemexTrails_1.0b1.zip"]] autorelease];
 	ASIHTTPRequest *request = [[[ASIHTTPRequest alloc] initWithURL:[NSURL URLWithString:@"http://trails-network.net/Downloads/MemexTrails_1.0b1.zip"]] autorelease];
 	[request setDownloadDestinationPath:[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip"]];
 	[request setDownloadDestinationPath:[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip"]];
+	[request setTemporaryFileDownloadPath:[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"MemexTrails_1.0b1.zip.download"]];
+	[request setAllowResumeForFileDownloads:YES];
 	[networkQueue addOperation:request];
 	[networkQueue addOperation:request];
 	[networkQueue go];
 	[networkQueue go];
 }
 }
@@ -61,6 +89,8 @@
 	} else {
 	} else {
 		[fileLocation setStringValue:[NSString stringWithFormat:@"File downloaded to %@",[request downloadDestinationPath]]];
 		[fileLocation setStringValue:[NSString stringWithFormat:@"File downloaded to %@",[request downloadDestinationPath]]];
 	}
 	}
+	[startButton setTitle:@"Start"];
+	[startButton setAction:@selector(URLFetchWithProgress:)];
 }
 }
 
 
 - (IBAction)fetchThreeImages:(id)sender
 - (IBAction)fetchThreeImages:(id)sender