Handle download errors

OpenRA.Launcher.Mac/Download.h

@@ -16,7 +16,8 @@
 	NSString *filename;
 	GameInstall *game;
 	NSTask *task;
-	NSString * status;
+	NSString *status;
+	NSString *error;
 	int bytesCompleted;
 	int bytesTotal;
 }
@@ -25,6 +26,7 @@
 @property(readonly) NSString *status;
 @property(readonly) int bytesCompleted;
 @property(readonly) int bytesTotal;
+@property(readonly) NSString *error;
 
 + (id)downloadWithURL:(NSString *)aURL filename:(NSString *)aFilename key:(NSString *)aKey game:(GameInstall *)aGame;
 - (id)initWithURL:(NSString *)aURL filename:(NSString *)aFilename key:(NSString *)aKey game:(GameInstall *)game;

OpenRA.Launcher.Mac/Download.m

@@ -15,6 +15,7 @@
 @synthesize status;
 @synthesize bytesCompleted;
 @synthesize bytesTotal;
+@synthesize error;
 
 + (id)downloadWithURL:(NSString *)aURL filename:(NSString *)aFilename key:(NSString *)aKey game:(GameInstall *)aGame
 {
@@ -32,17 +33,17 @@
 		filename = [aFilename retain];
 		key = [aKey retain];
 		game = [aGame retain];
+		error = @"";
 		
 		if ([[NSFileManager defaultManager] fileExistsAtPath:filename])
 		{
 			status = @"COMPLETE";
-			bytesCompleted = bytesTotal = [[[NSFileManager defaultManager] attributesOfItemAtPath:filename error:nil] fileSize];
+			bytesCompleted = bytesTotal = [[[NSFileManager defaultManager] attributesOfItemAtPath:filename error:NULL] fileSize];
 		}
 		else
 		{
 			status = @"AVAILABLE";
-			bytesCompleted = -1;
+			bytesCompleted = bytesTotal = -1;
-			bytesTotal = -1;
 		}
 	}
 	return self;
@@ -68,7 +69,13 @@
 		if ([type isEqualToString:@"Error"])
 		{
 			status = @"ERROR";
+			[error autorelease];
+			if ([[message substringToIndex:36] isEqualToString:@"The remote server returned an error:"])
+				error = [[message substringFromIndex:37] retain];
+			else
+				error = [message retain];
 		}
+			
 		else if ([type isEqualToString:@"Status"])
 		{
 			if ([message isEqualToString:@"Completed"])
@@ -95,8 +102,6 @@
 - (BOOL)start
 {
 	status = @"DOWNLOADING";
-
-	NSLog(@"Starting download...");
 	task = [game runAsyncUtilityWithArg:[NSString stringWithFormat:@"--download-url=%@,%@",url,filename]
 							   delegate:self
 					   responseSelector:@selector(utilityResponded:)
@@ -107,13 +112,13 @@
 
 - (BOOL)cancel
 {
-	NSLog(@"Cancelling");
 	status = @"ERROR";
-	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
+	error = @"Download Cancelled";
-	[nc removeObserver:self name:NSFileHandleReadCompletionNotification object:[[task standardOutput] fileHandleForReading]];
+	[[JSBridge sharedInstance] notifyDownloadProgress:self];
-	[nc removeObserver:self name:NSTaskDidTerminateNotification object:task];
+	[[NSNotificationCenter defaultCenter] removeObserver:self
+													name:NSFileHandleReadCompletionNotification
+												  object:[[task standardOutput] fileHandleForReading]];
 	[task terminate];
-	[task release]; task = nil;
 	return YES;
 }
 
@@ -124,6 +129,12 @@
 	[nc removeObserver:self name:NSFileHandleReadCompletionNotification object:[[task standardOutput] fileHandleForReading]];
 	[nc removeObserver:self name:NSTaskDidTerminateNotification object:task];
 	[task release]; task = nil;
+	
+	if (status == @"ERROR")
+	{	
+		[[NSFileManager defaultManager] removeItemAtPath:filename error:NULL];
+		bytesCompleted = bytesTotal = -1;
+	}
 }
 
 @end

OpenRA.Launcher.Mac/JSBridge.m

@@ -49,6 +49,7 @@ static JSBridge *SharedInstance;
 						@"startDownload", NSStringFromSelector(@selector(startDownload:)),
 						@"cancelDownload", NSStringFromSelector(@selector(cancelDownload:)),
 						@"downloadStatus", NSStringFromSelector(@selector(downloadStatus:)),
+						@"downloadError", NSStringFromSelector(@selector(downloadError:)),
 						@"bytesCompleted", NSStringFromSelector(@selector(bytesCompleted:)),
 						@"bytesTotal", NSStringFromSelector(@selector(bytesTotal:)),
 					nil] retain];
@@ -67,12 +68,6 @@ static JSBridge *SharedInstance;
 	[super dealloc];
 }
 
-- (void)notifyDownloadProgress:(Download *)download
-{
-	[[[controller webView] windowScriptObject] evaluateWebScript:
-		[NSString stringWithFormat:@"downloadProgressed('%@')",[download key]]];
-}
-
 #pragma mark JS API methods
 
 - (BOOL)launchMod:(NSString *)aMod
@@ -119,6 +114,15 @@ static JSBridge *SharedInstance;
 	return [d status];
 }
 
+- (NSString *)downloadError:(NSString *)key
+{
+	Download *d = [controller downloadWithKey:key];
+	if (d == nil)
+		return @"";
+	
+	return [d error];
+}
+
 - (BOOL)startDownload:(NSString *)key
 {
 	Download *d = [controller downloadWithKey:key];
@@ -143,6 +147,13 @@ static JSBridge *SharedInstance;
 	return (d == nil) ? -1 : [d bytesTotal];
 }
 
+- (void)notifyDownloadProgress:(Download *)download
+{
+	[[[controller webView] windowScriptObject] evaluateWebScript:
+	 [NSString stringWithFormat:@"downloadProgressed('%@')",[download key]]];
+}
+
+
 - (void)log:(NSString *)message
 {
 	NSLog(@"js: %@",message);

mods/cnc/mod.html

@@ -53,7 +53,7 @@
             	padding:20px;
             }
             
-            div.desc
+            .desc
             {
                 font-size:0.75em;
             }
@@ -102,15 +102,13 @@
         
         function download()
         {
+            document.getElementById("download-status").value = "Initializing..."
             window.external.startDownload("cnc-packages");
-            refreshDownloadButtons();
         }
 
         function cancel()
         {
             window.external.cancelDownload("cnc-packages");
-            // TODO: Remove incomplete file from cache
-            // TODO: Restore buttons to the before-downloading state
         }
         
         function extract()
@@ -136,7 +134,10 @@
             // Select the correct subsection
             if (installed == 0)
             {
-                window.external.registerDownload("cnc-packages", "http://localhost/~paul/cnc-packages.zip", "cnc-packages.zip");
+                //var url = "http://localhost/~paul/cnc-packages.zip";
+                //var url = "http://localhost/~paul/cnc-packages.bogus";
+                var url = "http://open-ra.org/get-dependency.php?file=cnc-packages";
+                window.external.registerDownload("cnc-packages", url, "cnc-packages.zip");
                 refreshDownloadButtons();
             }
         }
@@ -146,6 +147,7 @@
             document.getElementById("download-available").style.display = "none";
             document.getElementById("download-downloading").style.display = "none";
             document.getElementById("download-extract").style.display = "none";
+            document.getElementById("download-error").style.display = "none";
             
             // status can be NOT_REGISTERED, AVAILABLE, DOWNLOADING, COMPLETE, ERROR
             var status = window.external.downloadStatus("cnc-packages");
@@ -153,22 +155,21 @@
             
             // Download complete, offer button to extract it
             if (status == "COMPLETE")
-            {
                  document.getElementById("download-extract").style.display = "";
-            }
             
             // Show the download progress
             else if (status == "DOWNLOADING")
-            {
                 document.getElementById("download-downloading").style.display = "";
-            }
             
             // Show the download button
-            else if (status == "AVAILABLE" || status == "ERROR")
+            else if (status == "AVAILABLE")
-            {
                 document.getElementById("download-available").style.display = "";
             
-                // Todo: set error message
+            else if (status == "ERROR")
+            {
+                var message = window.external.downloadError("cnc-packages");
+                document.getElementById("error-message").innerHTML = message;
+                document.getElementById("download-error").style.display = "";
             }
         }
         
@@ -181,14 +182,14 @@
             var downloaded = window.external.bytesCompleted(file);
             window.external.log(file+" = total: "+total+" downloaded: "+downloaded);
 
-            if (downloaded == -1)
+            if (downloaded > 0)
-                return;
+            {            
+                var multiplier = 1/1048576.0;
+                total = (total*multiplier).toPrecision(2);
+                downloaded = (downloaded*multiplier).toPrecision(2);
             
-            var multiplier = 1/1048576.0;
+                document.getElementById("download-status").value = downloaded+"/"+total+" MB";
-            total = (total*multiplier).toPrecision(2);
+            }
-            downloaded = (downloaded*multiplier).toPrecision(2);
-            
-            document.getElementById("download-status").value = downloaded+"/"+total+" MB";
             refreshDownloadButtons();
         }
         
@@ -225,6 +226,10 @@
 			    <div id="download-extract" style="display:none">
 			        <input type="button" class="button" onclick="extract();" value="Install" />
 			    </div>
+			    <div id="download-error" style="display:none">
+			        <input type="button" class="button" onclick="download();" value="Retry" />
+			        <span class="desc" id="error-message"></span>
+			    </div>
 			</div>
 			<div id="buttons-upgrade" class="buttons" style="display:none">
 			    <div class="desc">