Cleaned up formating

alampros · Aug 26, 2011 · 19e765b · 19e765b
1 parent 2706ef2
commit 19e765b
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 48 deletions.
diff --git a/markium/markium.h b/markium/markium.h
@@ -11,5 +11,7 @@
 
 
 
-@interface markium : AIPlugin <AIHTMLContentFilter, AIContentFilter>{}
+@interface markium : AIPlugin <AIHTMLContentFilter, AIContentFilter>{
+}
+
 @end
diff --git a/markium/markium.m b/markium/markium.m
@@ -62,61 +62,62 @@ - (NSAttributedString *)filterAttributedString:(NSAttributedString *)inAttribute
 
 - (NSString *)filterHTMLString:(NSString *)inHTMLString content:(AIContentObject*)content;
 {
-
-    NSBundle *pluginBundle = [NSBundle bundleWithIdentifier:@"com.alampros.markium"];
-    NSString *mdExecPath = [pluginBundle pathForResource:@"redcarpet_w" ofType:@"rb"];
-//    NSLog(@"%@",mdExecPath);
-
-    NSTask *task;
-    NSData *markedResult;//*sortResult;
-    // Data object for grabbing marked text
-
-    NSFileHandle *fileToWrite;
-    // Handle to standard input for pipe
-    NSPipe *inputPipe, *outputPipe;
-    NSMutableString *markedText;
-
-    task = [[NSTask alloc] init];
-    inputPipe = [[NSPipe alloc] init];
-    outputPipe = [[NSPipe alloc] init];
-
-    [task setLaunchPath:mdExecPath];
-//    [task setArguments:[NSArray arrayWithObjects: @"-x", @"--nonotes", @"--nolabels", @"--nosmart", @"--process-html", nil]];
-
-    [task setStandardOutput: outputPipe];
-    [task setStandardInput:[NSPipe pipe]];
-    [task setStandardInput: inputPipe];
-    [task setStandardError:outputPipe];
-    [task waitUntilExit];
-    [task launch];
-
-    fileToWrite = [inputPipe fileHandleForWriting];
-
-    NSString *messageStr = [NSString stringWithString:content.messageString];    
-    NSLog(@"INPUT:\n%@\n----------\n\n",messageStr);
-    NSLog(@"inHTML:\n%@\n----------\n\n",inHTMLString);
-
-    [fileToWrite writeData:[messageStr dataUsingEncoding:NSUTF8StringEncoding]];
-//    NSLog(@"INPOUT:%@",content.messageString);
-//    [fileToWrite writeData:[content.messageString dataUsingEncoding:NSUTF8StringEncoding]];
-
-    [fileToWrite closeFile];
-
-    markedResult = [[outputPipe fileHandleForReading] readDataToEndOfFile];
-
-
-    markedText = [[NSMutableString alloc] initWithData: markedResult encoding: NSUTF8StringEncoding];
-
-//    NSLog(@"MARKED:%@",markedText);
+	NSString *messageStr = [NSString stringWithString:content.messageString];
+//	NSLog(@"INPUT:\n%@\n----------\n\n",messageStr);
+//	NSLog(@"inHTML:\n%@\n----------\n\n",inHTMLString);
 
+	if (messageStr.length == 0) {
+		return messageStr;
+	}
+
+	NSBundle *pluginBundle = [NSBundle bundleWithIdentifier:@"com.alampros.markium"];
+	NSString *mdExecPath = [pluginBundle pathForResource:@"redcarpet_w" ofType:@"rb"];
+	//    NSLog(@"%@",mdExecPath);
 
+	NSTask *task;
+	NSData *markedResult;//*sortResult;
+	// Data object for grabbing marked text
+
+	NSFileHandle *fileToWrite;
+//	Handle to standard input for pipe
+	NSPipe *inputPipe, *outputPipe;
+	NSMutableString *markedText;
+
+	task = [[NSTask alloc] init];
+	inputPipe = [[NSPipe alloc] init];
+	outputPipe = [[NSPipe alloc] init];
+
+	[task setLaunchPath:mdExecPath];
+//	[task setArguments:[NSArray arrayWithObjects: @"-x", @"--nonotes", @"--nolabels", @"--nosmart", @"--process-html", nil]];
+
+	[task setStandardOutput: outputPipe];
+	[task setStandardInput:[NSPipe pipe]];
+	[task setStandardInput: inputPipe];
+	[task setStandardError:outputPipe];
+	[task waitUntilExit];
+	[task launch];
+
+	fileToWrite = [inputPipe fileHandleForWriting];
+
+	[fileToWrite writeData:[messageStr dataUsingEncoding:NSUTF8StringEncoding]];
+//	NSLog(@"INPOUT:%@",content.messageString);
+//	[fileToWrite writeData:[content.messageString dataUsingEncoding:NSUTF8StringEncoding]];
+
+	[fileToWrite closeFile];
+
+	markedResult = [[outputPipe fileHandleForReading] readDataToEndOfFile];
+
+	markedText = [[NSMutableString alloc] initWithData: markedResult encoding: NSUTF8StringEncoding];
+
+//	NSLog(@"MARKED:%@",markedText);
+
 	NSString *pre = [[NSString alloc] initWithString:@"<pre>"];
 	NSString *post = [[NSString alloc] initWithString:@"</pre>"];
 
 	NSMutableArray *prePos = [[NSMutableArray alloc] init];
 	NSMutableArray *postPos = [[NSMutableArray alloc] init];
 	NSRange currentRange = NSMakeRange(0, markedText.length);
-
+	
 	currentRange = [markedText rangeOfString:pre options:NSCaseInsensitiveSearch range:currentRange];
 	while(currentRange.length > 0){
 		if(currentRange.length > 0){
@@ -155,4 +156,7 @@ - (NSString *)filterHTMLString:(NSString *)inHTMLString content:(AIContentObject
 	}
 	return [[markedText copy] autorelease];
 }
+
+
+
 @end