--- trunk/lib/Frey/SVN.pm	2008/12/15 20:10:48	851
+++ trunk/lib/Frey/SVN.pm	2009/04/27 19:55:32	1067
@@ -8,10 +8,12 @@
 
 extends 'Frey';
 with 'Frey::Web';
-#with 'Frey::Storage';
+with 'Frey::Storage';
+with 'Frey::HTML::Diff';
 
 use XML::Simple;
 use DateTimeX::Easy;
+use Text::Diff::Parser;
 
 has repository => (
 	is => 'rw',
@@ -20,12 +22,29 @@
 	default => 'file:///home/dpavlin/private/svn/Frey',
 );
 
+has path => (
+	is => 'rw',
+	isa => 'Str'
+);
+
 has limit => (
 	is => 'rw',
 	isa => 'Int',
 	default => 50,
 );
 
+has include_diff => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 1,
+);
+
+has file_stats => (
+	is => 'ro',
+	isa => 'Bool',
+	default => 1,
+);
+
 sub iterator {
 	my ($self,$coderef) = @_;
 	
@@ -48,14 +67,16 @@
 		return;
 	}
 
-	my $path = $self->repository;
+	my $path = $self->repository . $self->path;
 	warn "# path $path\n";
 
 	my $cmd;
+	my $svn_path = $path;
+
 	if ($path =~ m#file://# || -e "$path/.svn") {
 		$cmd = "svn log -v --xml $path";
 	} else {
-		my $svn_path = sh_regex('svk info', qr#Mirrored From:\s+([^,]+)#i);
+		$svn_path = sh_regex('svk info', qr#Mirrored From:\s+([^,]+)#i);
 
 		if (! $svn_path) {
 
@@ -91,7 +112,35 @@
 	my $xml = XMLin($log, ForceArray => [ 'logentry', 'path' ]);
 
 	foreach my $e (@{$xml->{'logentry'}}) {
-		warn "# e = ",$self->dump( $e );
+		warn "# e = ",$self->dump( $e ) if $self->debug;
+
+		if ( $self->include_diff || $self->file_stats ) {
+			my $rev = $e->{'revision'};
+			my $file = $svn_path;
+			$file =~ s{^\w+:/+}{};
+			my $file = "var/svn/$file/$rev.diff";
+			my $diff = $self->load( $file );
+			if ( ! $diff ) {
+				$diff = `svn diff -c $rev $svn_path`;
+				$self->store( $file, $diff );
+			}
+
+			$e->{diff} .= $diff if $self->include_diff;
+
+			$e->{diff_paths}->{rev} = $rev; # XXX debug
+
+			my $diff_path;
+			foreach my $line ( split(/[\n\r]/, $diff ) ) {
+				if ( $line =~ m{^\+\+\+ (\S+)} ) {
+					$diff_path = "/$1"; # subversion paths start with /
+				} elsif ( $line =~ m{^\+} ) {
+					$e->{diff_paths}->{$diff_path}->{added}++;
+				} elsif ( $line =~ m{^-} ) {
+					$e->{diff_paths}->{$diff_path}->{removed}++;
+				}
+			}
+		}
+
 		$coderef->($e);
 	}
 }
@@ -108,17 +157,52 @@
 		$foo =~ s/</&lt;/g;
 		$foo =~ s/>/&gt;/g;
 		$foo =~ s/"/&quot;/g;
-		$foo =~ s/([\n\r][\n\r]+)/<\/p>$1<p>/gis;
+#		$foo =~ s/([\n\r][\n\r]+)/$1<br\/>/gis;
 		$foo =~ s/([\n\r]+)([\-\*]\s+)/$1<br\/>$2/gis;
 		$foo =~ s/([\n\r]+)(r\d+:\s+)/$1<br\/>$2/gis;
 		$foo =~ s/([\n\r]+)(\s+r\d+@)/$1<br\/>$2/gis;		# svk
 		return $foo;
 	}
 
-	our $html = '';
-	sub html {
-		$html .= join("\n", @_);
-	}
+	my $repository = $self->repository;
+	my $path = $self->path;
+
+	our $html = qq|
+		<h1><a href="?repository=$repository">$repository</a></h1>
+		<h2>$path</h2>
+	|;
+
+	$self->add_css(qq|
+		.commit {
+			clear: both;
+			padding-top: 1em;
+			padding-bottom: 1em;
+			border-top: 1px dashed #ccc;
+		}
+		.files {
+			color: #888;
+			font-family: monospace;
+			font-size: 80%;
+			float: right;
+			padding-bottom: 1.2em; /* fix 80% back to original 1em */
+		}
+		.files a {
+			text-decoration: none;
+			color: #888;
+		}
+		.date, .revision { color: #666; }
+		.message {
+			padding-top: 0.5em;
+			padding-left: 2em; /* like blockquote */
+			white-space: pre-wrap;
+		}
+
+		ins { color: #8c8 }
+		del { color: #c88 }
+	|);
+
+	my $max_path_len = 0;
+	my $path_count;
 
 	$self->iterator( sub {
 		my $e = shift;
@@ -129,7 +213,12 @@
 		$date =~ s/T/ /;
 		$date =~ s/\.\d+Z$//;
 
-		html '<p><tt>'.$date.'</tt> <em>',$e->{'author'},'</em> <tt style="color:#808080">r',$e->{'revision'},'</tt></p>';
+		my $msg = $e->{'msg'};
+		$msg = '' if ref($msg); # FIXME why do I need this, dammit?
+		if ( $msg ) {
+			$msg = encode( $msg );
+			$msg = qq|<div class="message">$msg</div>|;
+		}
 
 		my @files;
 
@@ -143,16 +232,46 @@
 			} else {
 				push @files, $path;
 			}
+
+			$max_path_len = length $path if length $path > $max_path_len;
+			$path_count->{$path}++;
 		}
 
-		my $msg = $e->{'msg'};
-		$msg = '' if ref($msg); # FIXME why do I need this, dammit?
-		$msg = encode( $msg );
+		my $diff = $self->html_diff( $e->{diff} ) if $e->{diff};
+
+		$html .= $self->dump( $e->{diff_paths} );
 
-		html '<blockquote><p><tt style="color:#808080">',join(", ",@files),'</tt> ',$msg,'</p></blockquote>';
+		$html .= qq|
+			<div class="commit">
+				<span class="date">$date</span>
+				<em>$e->{author}</em>
+				<span class="revision">$e->{revision}</span>
+				<div class="files">\n
+				|
+				. join("<br>\n",
+					map {
+						my $path = $_;
+						$path =~ s{<[^>]+>}{}g;
+						qq|<a href="?repository=$repository;path=$path" title="$path ##">$_</a>|
+					} @files
+				)
+				. qq|
+				</div>
+				$msg
+				$diff
+			</div>
+		|;
 
 	});
 
+	$self->add_css(qq|
+		.files {
+			width: ${max_path_len}ex;
+		}
+	|);
+
+	$html =~ s[title="(\S+) ##"]['title="' . $path_count->{$1} . '"']gse;
+
 	return $html;
 }
 
@@ -172,7 +291,13 @@
 
 		foreach my $p (@{$e->{'paths'}->{'path'}}) {
 			my ($action,$path) = ($p->{'action'},$p->{'content'});
-			$file_events .= qq|\t<event filename="$path" date="$date" author="$author" />\n|;
+			my $weight = '';
+			if ( defined   $e->{diff_paths}->{$path} ) {
+				$weight  = $e->{diff_paths}->{$path}->{removed};
+				$weight += $e->{diff_paths}->{$path}->{added} * 2;
+				$weight  = qq| weight="$weight" |;
+			}
+			$file_events .= qq|\t<event filename="$path" date="$date" author="$author"$weight/>\n|;
 		}
 
 	});