github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor handling of HTML output in OakCommand

Browse Source 
Setup and teardown is now contained in the same method.
This commit is contained in:
Allan Odgaard
2016-09-26 13:04:43 +02:00
parent 4dea28811c
commit 8e9cd68c4f
1 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Frameworks/OakCommand/src/OakCommand.mm
View File

@@ -196,34 +196,54 @@ static pid_t run_command (dispatch_group_t rootGroup, std::string const& cmd, in
- (void)writeHTMLOutput:(char const*)bytes length:(size_t)len
{
if(!_htmlOutputView)
_htmlOutputView = [self htmlOutputView:YES forIdentifier:self.identifier];
if(!_fileHandleForWritingHTML)
if(bytes)
{
NSPipe* pipe = [NSPipe pipe];
_fileHandleForWritingHTML = pipe.fileHandleForWriting;
_queueForWritingHTML = dispatch_queue_create("org.textmate.write-html", DISPATCH_QUEUE_SERIAL);
if(!_htmlOutputView)
_htmlOutputView = [self htmlOutputView:YES forIdentifier:self.identifier];
static NSInteger UniqueKey = 0; // Make each URL unique to avoid caching
if(!_fileHandleForWritingHTML)
{
NSPipe* pipe = [NSPipe pipe];
_fileHandleForWritingHTML = pipe.fileHandleForWriting;
_queueForWritingHTML = dispatch_queue_create("org.textmate.write-html", DISPATCH_QUEUE_SERIAL);
_urlRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://job/%@/%ld", kOakFileHandleURLScheme, [to_ns(_bundleCommand.name) stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], ++UniqueKey]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:6000];
[NSURLProtocol setProperty:self.identifier forKey:@"commandIdentifier" inRequest:_urlRequest];
[NSURLProtocol setProperty:pipe.fileHandleForReading forKey:@"fileHandle" inRequest:_urlRequest];
[NSURLProtocol setProperty:@(_processIdentifier) forKey:@"processIdentifier" inRequest:_urlRequest];
[NSURLProtocol setProperty:to_ns(_bundleCommand.name) forKey:@"processName" inRequest:_urlRequest];
[NSURLProtocol setProperty:self forKey:@"command" inRequest:_urlRequest];
static NSInteger UniqueKey = 0; // Make each URL unique to avoid caching
[_htmlOutputView loadRequest:_urlRequest environment:_environment autoScrolls:_bundleCommand.auto_scroll_output];
_urlRequest = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@://job/%@/%ld", kOakFileHandleURLScheme, [to_ns(_bundleCommand.name) stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], ++UniqueKey]] cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:6000];
[NSURLProtocol setProperty:self.identifier forKey:@"commandIdentifier" inRequest:_urlRequest];
[NSURLProtocol setProperty:pipe.fileHandleForReading forKey:@"fileHandle" inRequest:_urlRequest];
[NSURLProtocol setProperty:@(_processIdentifier) forKey:@"processIdentifier" inRequest:_urlRequest];
[NSURLProtocol setProperty:to_ns(_bundleCommand.name) forKey:@"processName" inRequest:_urlRequest];
[NSURLProtocol setProperty:self forKey:@"command" inRequest:_urlRequest];
[_htmlOutputView loadRequest:_urlRequest environment:_environment autoScrolls:_bundleCommand.auto_scroll_output];
}
NSData* data = [NSData dataWithBytes:bytes length:len];
NSFileHandle* fh = _fileHandleForWritingHTML;
dispatch_async(_queueForWritingHTML, ^{
ssize_t bytesWritten = write(fh.fileDescriptor, [data bytes], [data length]);
if(bytesWritten == -1)
perror("HTMLOutput: write");
});
}
else
{
if(NSFileHandle* fh = std::exchange(_fileHandleForWritingHTML, nil))
{
dispatch_async(_queueForWritingHTML, ^{
[fh closeFile];
});
_queueForWritingHTML = nil;
}
NSData* data = [NSData dataWithBytes:bytes length:len];
NSFileHandle* fh = _fileHandleForWritingHTML;
dispatch_async(_queueForWritingHTML, ^{
ssize_t bytesWritten = write(fh.fileDescriptor, [data bytes], [data length]);
if(bytesWritten == -1)
perror("HTMLOutput: write");
});
if(NSMutableURLRequest* request = std::exchange(_urlRequest, nil))
{
[NSURLProtocol removePropertyForKey:@"command" inRequest:request];
[NSURLProtocol removePropertyForKey:@"fileHandle" inRequest:request];
[NSURLProtocol removePropertyForKey:@"processIdentifier" inRequest:request];
}
}
}
- (void)executeWithInput:(NSFileHandle*)fileHandleForReading variables:(std::map<std::string, std::string> const&)someVariables outputHandler:(void(^)(std::string const& out, output::type placement, output_format::type format, output_caret::type outputCaret, std::map<std::string, std::string> const& environment))handler
@@ -370,7 +390,6 @@ static pid_t run_command (dispatch_group_t rootGroup, std::string const& cmd, in
break;
}
BOOL discardHTML = NO;
BOOL normalExit = rc == 0 || (200 <= rc && rc <= 207);
if(normalExit == NO && _userDidAbort == NO)
{
@@ -401,6 +420,8 @@ static pid_t run_command (dispatch_group_t rootGroup, std::string const& cmd, in
if(!err.empty())
[self writeHTMLOutput:err.data() length:err.size()];
[self writeHTMLOutput:nullptr length:0];
}
}
else if(placement == output::tool_tip)
@@ -422,26 +443,7 @@ static pid_t run_command (dispatch_group_t rootGroup, std::string const& cmd, in
}
else if(_htmlOutputView)
{
discardHTML = YES;
}
if(NSFileHandle* fh = std::exchange(_fileHandleForWritingHTML, nil))
{
dispatch_async(_queueForWritingHTML, ^{
[fh closeFile];
});
_queueForWritingHTML = nil;
}
if(NSMutableURLRequest* request = std::exchange(_urlRequest, nil))
{
[NSURLProtocol removePropertyForKey:@"command" inRequest:request];
[NSURLProtocol removePropertyForKey:@"fileHandle" inRequest:request];
[NSURLProtocol removePropertyForKey:@"processIdentifier" inRequest:request];
}
if(discardHTML)
{
[self writeHTMLOutput:nullptr length:0];
[self discardHTMLOutputView:_htmlOutputView];
}