epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use utility app for http requests; Make them async.

Browse Source
This commit is contained in:
Paul Chote
2010-12-30 13:34:13 +13:00
parent 428999fc0b
commit 39ed6087cb
12 changed files with 100 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Launcher.Mac/JSBridge.m
View File

@@ -44,7 +44,7 @@ static JSBridge *SharedInstance;
@"log", NSStringFromSelector(@selector(log:)),
@"existsInMod", NSStringFromSelector(@selector(fileExists:inMod:)),
@"metadata", NSStringFromSelector(@selector(metadata:forMod:)),
@"httpRequest", NSStringFromSelector(@selector(httpRequest:)),
@"httpRequest", NSStringFromSelector(@selector(httpRequest:withCallback:)),
// File downloading
@"registerDownload", NSStringFromSelector(@selector(registerDownload:withURL:filename:)),
@@ -71,6 +71,13 @@ static JSBridge *SharedInstance;
[super dealloc];
}
- (void)runCallback:(NSString *)cb withArgument:(NSString *)arg
{
NSString *cmd = [NSString stringWithFormat:@"%@('%@')", cb,
[arg stringByReplacingOccurrencesOfString:@"\n" withString:@"\\n"]];
[[[controller webView] windowScriptObject] evaluateWebScript:cmd];
}
#pragma mark JS API methods
- (BOOL)launchMod:(NSString *)aMod
@@ -155,18 +162,6 @@ static JSBridge *SharedInstance;
return (d == nil) ? -1 : [d bytesTotal];
}
- (void)notifyDownloadProgress:(Download *)download
{
[[[controller webView] windowScriptObject] evaluateWebScript:
[NSString stringWithFormat:@"downloadProgressed('%@')",[download key]]];
}
- (void)notifyExtractProgress:(Download *)download
{
[[[controller webView] windowScriptObject] evaluateWebScript:
[NSString stringWithFormat:@"extractProgressed('%@')",[download key]]];
}
- (BOOL)extractDownload:(NSString *)key toPath:(NSString *)aFile inMod:(NSString *)aMod
{
Download *d = [controller downloadWithKey:key];
@@ -233,12 +228,9 @@ static JSBridge *SharedInstance;
return @"";
}
- (NSString *)httpRequest:(NSString *)url
- (void)httpRequest:(NSString *)url withCallback:(NSString *)cb
{
NSLog(@"Requesting url %@",url);
NSString *response = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSASCIIStringEncoding error:NULL];
NSLog(@"Response %@",response);
return response;
[controller fetchURL:url withCallback:cb];
}
@end