@@ -9,11 +9,12 @@ #import <Cocoa/Cocoa.h> @class AppController; -// @class RequestDetailsController; +@class LogParser; @interface LogDocument : NSDocument { BOOL compressedLog; NSArray *requests; + LogParser *logParser; NSPredicate *filterPredicate; LogDocument.h @@ -29,8 +29,6 @@ static NSMutableDictionary *HTTPMethodColors; @interface LogDocument (PrivateMethods) + (NSColor *)colorForHTTPMethod:(NSString *)method brighten:(BOOL)brighten; -- (void)parseLogData:(NSData *)data; -- (NSData *)gunzipedDataFromData:(NSData *)compressedData; @end @implementation LogDocument @@ -96,7 +94,13 @@ static NSMutableDictionary *HTTPMethodColors; [self setCompressedLog:NO]; } - [NSThread detachNewThreadSelector:@selector(parseLogData:) toTarget:self withObject:data]; + logParser = [[LogParser alloc] initWithDocument:self]; + + // The parser handles the log data on a background thread. When it is done + // it will call back on the main thread to set the requests property. + [NSThread detachNewThreadSelector:@selector(parseLogData:) + toTarget:logParser + withObject:data]; // Always return YES. Not quite sure what we should do if there is ever an error // in the legitimate load process. @@ -214,17 +218,4 @@ static NSMutableDictionary *HTTPMethodColors; } -#pragma mark Implementation - -/* - * Parse the data read from the logfile passing on whether the log data is compressed - * or not. The resulting array of RailsRequest instances assigned to the 'requests' - * property back on the main thread. - */ -- (void)parseLogData:(NSData *)data { - LogParser *parser = [[LogParser alloc] initWithDocument:self]; - [self performSelectorOnMainThread:@selector(setRequests:) withObject:[parser parseLogData:data isCompressed:[self compressedLog]] waitUntilDone:YES]; -} - - @end LogDocument.m @@ -18,11 +18,13 @@ NSDateFormatter *dateParser; ParamParser *paramParser; + NSUInteger highWaterMark; + ParsingProgressController *progressController; } - (id)initWithDocument:(LogDocument *)theDocument; -- (NSArray *)parseLogData:(NSData *)data isCompressed:(BOOL)isCompressed; +- (void)parseLogData:(NSData *)data; @end LogParser.h @@ -38,40 +38,44 @@ - (id)initWithDocument:(LogDocument *)theDocument { if( ( self = [super init] ) ) { - document = theDocument; - dateParser = [[NSDateFormatter alloc] init]; + document = theDocument; + dateParser = [[NSDateFormatter alloc] init]; [dateParser setDateFormat:@"yyyy-MM-dd HH:mm:ss"]; - paramParser = [[ParamParser alloc] init]; + paramParser = [[ParamParser alloc] init]; + highWaterMark = 0; } return self; } -- (NSArray *)parseLogData:(NSData *)data isCompressed:(BOOL)isCompressed { +- (void)parseLogData:(NSData *)data { progressController = [[ParsingProgressController alloc] init]; [progressController showWindow:self]; [progressController setAnimated:YES]; - if( isCompressed ) { - [progressController setStatus:@"Decompressing log file"]; + if( [document compressedLog] ) { + [progressController setStatus:@"Decompressing log data"]; data = [data gzipInflate]; } - [progressController setStatus:@"Scanning log file"]; + [progressController setStatus:@"Scanning log data"]; NSString *content = [[NSString alloc] initWithData:data encoding:NSASCIIStringEncoding]; NSArray *lines = [content componentsSeparatedByString:@"\n"]; - [progressController setStatus:@"Parsing log file"]; + [progressController setStatus:@"Parsing log data"]; [progressController setMin:0 max:[lines count]]; NSLog( @"%d lines to parse.", [lines count] ); NSArray *requests = [self parseLogLines:lines]; - [progressController close]; NSLog( @"%d requests parsed.", [requests count] ); - return requests; + highWaterMark = [data length]; + + [document performSelectorOnMainThread:@selector(setRequests:) withObject:requests waitUntilDone:YES]; + + [progressController close]; } LogParser.m bc239abc174e6bfb17bb8d7b1d0ab6e3fa0d6978 Matt Mower self@mattmower.com http://github.com/mmower/spike/commit/b71f6604df5d397e6519a6d100d02e6b1725de7e b71f6604df5d397e6519a6d100d02e6b1725de7e 2009-02-21T06:26:47-08:00 2009-02-21T06:26:47-08:00 Simplified relationship between LogDocument and LogParser. b0e0f509f7764b6e163b0e433e031ab0969bfad1 Matt Mower self@mattmower.com