New History view

Less javascript

Author: laullon

GLFileView.h

@@ -29,7 +29,8 @@
 - (void)didLoad;
 - (NSString *)parseBlame:(NSString *)txt;
 + (NSString *)parseHTML:(NSString *)txt;
-+ (NSString *) parseDiff:(NSString *)txt;
++ (NSString *)parseDiff:(NSString *)txt;
++ (NSString *)parseDiffTree:(NSString *)txt;
 +(BOOL)isStartDiff:(NSString *)line;
 +(BOOL)isStartBlock:(NSString *)line;
 

GLFileView.m

@@ -223,7 +223,31 @@ + (NSString *) parseHTML:(NSString *)txt
 	return txt;
 }
 
-+ (NSString *) parseDiff:(NSString *)txt
++ (NSString *)parseDiffTree:(NSString *)txt
+{
+	NSArray *lines = [txt componentsSeparatedByString:@"\n"];
+	NSMutableString *res=[NSMutableString string];
+	[res appendString:@"<ul>"];
+	int i;
+	for (i=1; i<[lines count]; i++) {
+		NSString *line=[lines objectAtIndex:i];
+		NSArray *fields=[line componentsSeparatedByString:@" "];
+		NSArray *fileStatus=[[fields objectAtIndex:4] componentsSeparatedByString:@"\t"];
+		NSString *status=[[fileStatus objectAtIndex:0] substringToIndex:1]; // ignore the score
+		NSString *file=[fileStatus objectAtIndex:1];
+		NSString *txt=file;
+		NSString *fileName=file;
+		if([status isEqualToString:@"C"] || [status isEqualToString:@"R"]){
+			txt=[NSString stringWithFormat:@"%@ -&gt; %@",file,[fileStatus objectAtIndex:2]];
+			fileName=[fileStatus objectAtIndex:2];
+		}
+		[res appendString:[NSString stringWithFormat:@"<li><a class='%@' href='#%@' representedFile='%@'>%@</a></li>",status,file,fileName,txt]];
+	}
+	[res appendString:@"</ul>"];
+	return res;
+}
+
++ (NSString *)parseDiff:(NSString *)txt
 {
 	txt=[self parseHTML:txt];
 
@@ -250,11 +274,15 @@ + (NSString *) parseDiff:(NSString *)txt
 			NSArray *pos_l=[[pos objectAtIndex:0] componentsSeparatedByString:@","];
 			NSArray *pos_r=[[pos objectAtIndex:1] componentsSeparatedByString:@","];
 
-			l_line=l_int=abs([[pos_l objectAtIndex:0]integerValue]);
-			l_end=l_line+[[pos_l objectAtIndex:1]integerValue];
+			l_end=l_line=l_int=abs([[pos_l objectAtIndex:0]integerValue]);
+			if ([pos_l count]>1) {
+				l_end=l_line+[[pos_l objectAtIndex:1]integerValue];				
+			}
 
-			r_line=r_int=[[pos_r objectAtIndex:0]integerValue];
-			r_end=r_line+[[pos_r objectAtIndex:1]integerValue];
+			r_end=r_line=r_int=[[pos_r objectAtIndex:0]integerValue];
+			if ([pos_r count]>1) {
+				r_end=r_line+[[pos_r objectAtIndex:1]integerValue];
+			}
 
 			[res appendString:[NSString stringWithFormat:@"<tr class='header'><td colspan='3'>%@</td></tr>",line]];
 			inBlock=TRUE;
@@ -274,7 +302,8 @@ + (NSString *) parseDiff:(NSString *)txt
 			if(inDiff)
 				[res appendString:@"</tbody></table>"];
 			inDiff=TRUE;
-			[res appendString:@"<table class='diff'><thead><tr><td colspan='3'>"];
+			NSString *fileName=[self getFileName:line];
+			[res appendString:[NSString stringWithFormat:@"<table id='%@' class='diff'><thead><tr><td colspan='3'>",fileName]];
 			[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
 		}else if(inDiff){
 			[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
@@ -285,14 +314,20 @@ + (NSString *) parseDiff:(NSString *)txt
 	return res;
 }
 
++(NSString *)getFileName:(NSString *)line{
+	NSRange b = [line rangeOfString:@"b/"];
+	NSString *file=[line substringFromIndex:b.location+2];
+	return file;
+}
+
 +(BOOL)isStartDiff:(NSString *)line
 {
 	return (([line length]>10) && [[line substringToIndex:10] isEqualToString:@"diff --git"]);
 }
 
 +(BOOL)isStartBlock:(NSString *)line
 {
-	return (([line length]>2) && [[line substringToIndex:2] isEqualToString:@"@@"]);
+	return (([line length]>3) && [[line substringToIndex:3] isEqualToString:@"@@ "]);
 }
 
 - (NSString *) parseBlame:(NSString *)txt

PBWebController.h

@@ -26,4 +26,6 @@
 
 - (WebScriptObject *) script;
 - (void) closeView;
+- (BOOL) isFeatureEnabled:(NSString *)feature;
+
 @end

PBWebHistoryController.h

@@ -16,7 +16,6 @@
 
 @class PBGitSHA;
 
-
 @interface PBWebHistoryController : PBWebController {
 	IBOutlet PBGitHistoryController* historyController;
 	IBOutlet id<PBRefContextDelegate> contextMenuDelegate;
@@ -27,6 +26,8 @@
 
 - (void) changeContentTo: (PBGitCommit *) content;
 - (void) sendKey: (NSString*) key;
+- (NSString *)parseHeader:(NSString *)txt withRefs:(NSString *)badges;
+- (NSString *) someMethodThatReturnsSomeHashForSomeString:(NSString*)concat;
 
 @property (readonly) NSString* diff;
 @end

PBWebHistoryController.m

@@ -9,6 +9,8 @@
 #import "PBWebHistoryController.h"
 #import "PBGitDefaults.h"
 #import "PBGitSHA.h"
+#import "GLFileView.h"
+#import <CommonCrypto/CommonDigest.h>
 
 @implementation PBWebHistoryController
 
@@ -26,7 +28,7 @@ - (void)closeView
 {
 	[[self script] setValue:nil forKey:@"commit"];
 	[historyController removeObserver:self forKeyPath:@"webCommit"];
-
+	
 	[super closeView];
 }
 
@@ -48,31 +50,17 @@ - (void) changeContentTo: (PBGitCommit *) content
 {
 	if (content == nil || !finishedLoading)
 		return;
-
-	// The sha is the same, but refs may have changed.. reload it lazy
-	if ([currentSha isEqual:[content sha]])
-	{
-		[[self script] callWebScriptMethod:@"reload" withArguments: nil];
-		return;
-	}
-
-	NSArray *arguments = [NSArray arrayWithObjects:content, [[[historyController repository] headRef] simpleRef], nil];
-	id scriptResult = [[self script] callWebScriptMethod:@"loadCommit" withArguments: arguments];
-	if (!scriptResult) {
-		// the web view is not really ready for scripting???
-		[self performSelector:_cmd withObject:content afterDelay:0.05];
-		return;
-	}
+	
 	currentSha = [content sha];
-
+	
 	// Now we load the extended details. We used to do this in a separate thread,
 	// but this caused some funny behaviour because NSTask's and NSThread's don't really
 	// like each other. Instead, just do it async.
-
-	NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", [currentSha string], nil];
+	
+	NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--summary", @"--pretty=raw", [currentSha string], nil];
 	if (![PBGitDefaults showWhitespaceDifferences])
 		[taskArguments insertObject:@"-w" atIndex:1];
-
+	
 	NSFileHandle *handle = [repository handleForArguments:taskArguments];
 	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 	// Remove notification, in case we have another one running
@@ -84,25 +72,122 @@ - (void) changeContentTo: (PBGitCommit *) content
 - (void)commitDetailsLoaded:(NSNotification *)notification
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadToEndOfFileCompletionNotification object:nil];
-
+	
 	NSData *data = [[notification userInfo] valueForKey:NSFileHandleNotificationDataItem];
 	if (!data)
 		return;
-
+	
 	NSString *details = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 	if (!details)
 		details = [[NSString alloc] initWithData:data encoding:NSISOLatin1StringEncoding];
-
+	
 	if (!details)
 		return;
+	
+	
+	NSMutableString *refs=[NSMutableString string];
+	NSArray *refsA=[historyController.webCommit refs];
+	NSString *currentRef=[[[historyController repository] headRef] simpleRef];
+	NSString *style=@"";
+	int r=0;
+	for(r=0;r<[refsA count];r++){
+		PBGitRef *ref=[refsA objectAtIndex:r];
+		if([currentRef isEqualToString:[ref ref]]){
+			style=[NSString stringWithFormat:@"currentBranch refs %@",[ref type]];
+		}else{
+			style=[NSString stringWithFormat:@"refs %@",[ref type]];
+		}
+		[refs appendString:[NSString stringWithFormat:@"<span class='%@'>%@</span>",style,[ref shortName]]];
+	}
+	
+	// Header
+	NSString *header=[self parseHeader:details withRefs:refs];
+	
+	// File list
+	NSString *dt=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"-r", @"-C90%", @"-M90%", [currentSha string], nil]];
+	NSString *fileList=[GLFileView parseDiffTree:dt];
+	
+	// Diffs list
+	NSString *d=[repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff-tree", @"--cc", @"-C90%", @"-M90%", [currentSha string], nil]];
+	NSString *diffs=[GLFileView parseDiff:d];
+	
+	NSString *html=[NSString stringWithFormat:@"%@%@%@",header,fileList,diffs];
+	
+	[[view windowScriptObject] callWebScriptMethod:@"showDiff" withArguments:[NSArray arrayWithObject:html]];
+	
+#if 1
+	NSString *dom=[[[[view mainFrame] DOMDocument] documentElement] outerHTML];
+	NSString *tmpFile=@"~/tmp/test2.html";
+	[dom writeToFile:[tmpFile stringByExpandingTildeInPath] atomically:true encoding:NSUTF8StringEncoding error:nil];
+#endif 
+}
+
+- (NSString *)parseHeader:(NSString *)txt withRefs:(NSString *)badges
+{
+	NSArray *lines = [txt componentsSeparatedByString:@"\n"];
+	NSString *line;
+	NSString *last_mail=@"";
+	NSMutableString *auths=[NSMutableString string];
+	NSMutableString *refs=[NSMutableString string];
+	NSMutableString *subject=[NSMutableString string];
+	BOOL subj=FALSE;
+	
+	int i;
+	for (i=0; i<[lines count]; i++) {
+		line=[lines objectAtIndex:i];
+		if([line length]==0){
+			if(!subj){
+				subj=TRUE;
+			}else{
+				i=[lines count];
+			}
+		}else{
+			if (subj) {
+				[subject appendString:[NSString stringWithFormat:@"%@<br/>",[line stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]]];
+			}else{
+				NSArray *comps=[line componentsSeparatedByString:@" "];
+				if([comps count]==2){
+					[refs appendString:[NSString stringWithFormat:@"<tr><td>%@</td><td><a href='' onclick='selectCommit(this.innerHTML); return false;'>%@</a></td></tr>",[comps objectAtIndex:0],[comps objectAtIndex:1]]];
+				}else if([comps count]>2){
+					NSRange r_email_i = [line rangeOfString:@"<"];
+					NSRange r_email_e = [line rangeOfString:@">"];
+					NSRange r_name_i = [line rangeOfString:@" "];
+					
+					NSString *rol=[line substringToIndex:r_name_i.location];
+					NSString *name=[line substringWithRange:NSMakeRange(r_name_i.location,(r_email_i.location-r_name_i.location))];
+					NSString *email=[line substringWithRange:NSMakeRange(r_email_i.location+1,((r_email_e.location-1)-r_email_i.location))];
+					NSString *time=[line substringFromIndex:r_email_e.location+2];
+					
+					if(![email isEqualToString:last_mail]){
+						[auths appendString:[NSString stringWithFormat:@"<div class='user %@ clearfix'>",rol]];
+						if([self isFeatureEnabled:@"gravatar"]){
+							NSString *hash=[self someMethodThatReturnsSomeHashForSomeString:email];
+							[auths appendString:[NSString stringWithFormat:@"<img class='avatar' src='http://www.gravatar.com/avatar/%@?d=wavatar&s=30'/>",hash]];
+						}
+						[auths appendString:[NSString stringWithFormat:@"<p class='name'>%@ <span class='rol'>(%@)</span></p>",name,rol]];
+						[auths appendString:[NSString stringWithFormat:@"<p class='time'>%@</p></div>",time]];
+					}
+					last_mail=email;
+				}
+			}
+		}
+	}	
+	
+	return [NSString stringWithFormat:@"<div id='header' class='clearfix'><table class='references'>%@</table><p class='subject'>%@</p>%@<div id='badges'>%@</div></div>",refs,subject,auths,badges];
+}
 
-	NSRange range = [details rangeOfString:@"diff --git"];
-	NSString *commitDetails=[details substringToIndex:range.location];
-	NSString *diffs=[details substringFromIndex:range.location];
-	NSString *pd=[GLFileView parseDiff:diffs];
+- (NSString *) someMethodThatReturnsSomeHashForSomeString:(NSString*)concat {
+	const char *concat_str = [concat UTF8String];
+	unsigned char result[CC_MD5_DIGEST_LENGTH];
+	CC_MD5(concat_str, strlen(concat_str), result);
+	
+	NSMutableString *hash = [NSMutableString string];
+	
+	int i;
+	for (i = 0; i < 16; i++)
+		[hash appendFormat:@"%02x", result[i]];
 
-	[[view windowScriptObject] callWebScriptMethod:@"loadCommitDetails" withArguments:[NSArray arrayWithObject:commitDetails]];	
-	[[view windowScriptObject] callWebScriptMethod:@"newStyle" withArguments:[NSArray arrayWithObject:pd]];
+	return hash;
 }
 
 - (void)selectCommit:(NSString *)sha
@@ -126,10 +211,10 @@ - (void) copySource
 
 - (NSArray *)	   webView:(WebView *)sender
 contextMenuItemsForElement:(NSDictionary *)element
-		  defaultMenuItems:(NSArray *)defaultMenuItems
+		defaultMenuItems:(NSArray *)defaultMenuItems
 {
 	DOMNode *node = [element valueForKey:@"WebElementDOMNode"];
-
+	
 	while (node) {
 		// Every ref has a class name of 'refs' and some other class. We check on that to see if we pressed on a ref.
 		if ([[node className] hasPrefix:@"refs "]) {
@@ -144,27 +229,27 @@ - (NSArray *)	   webView:(WebView *)sender
 		}
 		if ([node hasAttributes] && [[node attributes] getNamedItem:@"representedFile"])
 			return [historyController menuItemsForPaths:[NSArray arrayWithObject:[[[node attributes] getNamedItem:@"representedFile"] value]]];
-        else if ([[node class] isEqual:[DOMHTMLImageElement class]]) {
-            // Copy Image is the only menu item that makes sense here since we don't need
+		else if ([[node class] isEqual:[DOMHTMLImageElement class]]) {
+			// Copy Image is the only menu item that makes sense here since we don't need
 			// to download the image or open it in a new window (besides with the
 			// current implementation these two entries can crash GitX anyway)
 			for (NSMenuItem *item in defaultMenuItems)
 				if ([item tag] == WebMenuItemTagCopyImageToClipboard)
 					return [NSArray arrayWithObject:item];
 			return nil;
-        }
-
+		}
+		
 		node = [node parentNode];
 	}
-
+	
 	return defaultMenuItems;
 }
 
 
 // Open external links in the default browser
 -   (void)webView:(WebView *)sender decidePolicyForNewWindowAction:(NSDictionary *)actionInformation
-   		  request:(NSURLRequest *)request
-     newFrameName:(NSString *)frameName
+		  request:(NSURLRequest *)request
+	 newFrameName:(NSString *)frameName
  decisionListener:(id < WebPolicyDecisionListener >)listener
 {
 	[[NSWorkspace sharedWorkspace] openURL:[request URL]];