X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/cd726ba1120253b6387e1a558f36ba78f3cd8cbd..HEAD:/source.plp

diff --git a/source.plp b/source.plp
index ef730a4..cf22e34 100644
--- a/source.plp
+++ b/source.plp
@@ -10,9 +10,10 @@ if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
 		my $data = do $source or die $@ || $! || 'read error';
 		require JSON;
 		my $converter = JSON->new;
-		$converter->utf8->indent->space_after->canonical;
+		$converter->indent->space_after->canonical;
 
 		$header{content_type} = 'application/json';
+		$header{'Access-Control-Allow-Origin'} = '*';
 		$header{content_type} = 'text/plain' if exists $get{debug};
 		print $_, '(' for $get{callback} // ();
 		print $converter->encode($data);
@@ -28,7 +29,7 @@ if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
 
 Html({
 	title => "$source source code",
-	version => '1.1',
+	version => '1.3',
 	description => !$source ? 'Index of source files for this site.' : [
 		"Source code of the $source file at this site,",
 		"with syntax highlighted and references linked."
@@ -42,34 +43,53 @@ Html({
 
 say '';
 
-if (not $source) {
-	print "<h1>Source files</h1>";
+if (not $source or -d $source) {
+	PLP_START {
+		print "<h1>Source files</h1>";
+	};
+
+	if ($source and $source ne 'tools') {
+		Abort("Directory index not permitted", '403 source not allowed');
+	}
 
 	print "<p>Project code distributed under the AGPL. Please contribute back.</p>";
 	say '<ul>';
-	for (glob '*.plp') {
-		chomp;
+	for (glob($source ? "$source/*" : '*.plp')) {
 		say '<li>', showlink($_, "/source/$_");
 	}
 	say "</ul>\n";
 }
 else {
 	my $href = showlink($source, $source =~ m{\A (\w+) \.plp \z}x && "/$1");
-	say "<h1>Source of $href</h1>";
+	PLP_START {
+		say "<h1>Source of $href</h1>";
+	};
 
+	my $path = $source;
 	if ($source =~ m{(?:/|^)\.}) {
-		die "File request not permitted\n";
+		Abort("File request not permitted", '403 source not allowed');
 	}
 	elsif ($source =~ s{::}{/}g or !-e $source) {
 		$source .= '.pm';
 		for (0 .. $#INC) {
 			-e ($_ = "$INC[$_]/$source") or next;
-			$source = $_;
+			$path = $_;
 			last;
 		}
 	}
-	-r $source or die "Requested file not found\n";
-	my $size = (stat $source)->[7];
+	-r $path or Abort("Requested file not found", '404 source not found');
+	my $size = (stat $path)->[7];
+
+	my $cachefile = "source/$source.html";
+	if (-e $cachefile and (stat $cachefile)->[9] >= (stat $path)->[9]) {
+		say '<pre>';
+		print decode_utf8(ReadFile($cachefile));
+		say '</pre>';
+		exit;
+	}
+	-e or mkdir for $cachefile =~ s{[^/]+\z}{}r; # dirname
+	open my $cache, '>', $cachefile
+		or Alert("Could not save cache", "Opening $cachefile failed: $!");;
 
 	if (my $hl = eval {
 		$size < 32_768 or die 'large files take too long to parse';
@@ -78,14 +98,18 @@ else {
 			or die 'early versions are buggy under FastCGI';
 		delete $Text::VimColor::SYNTAX_TYPE{Underlined};
 		return Text::VimColor->new(
-			file => $source,
-			vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+			file => $path,
+			vim_options => [@Text::VimColor::VIM_OPTIONS,
+				'+:set enc=utf-8',
+				'+:let perl_sub_signatures=1',
+			],
 		)->marked;
 	}) {
 		my %TYPETAG = (
 			Statement => 'strong',
 			Error     => 'em',
 			Todo      => 'em',
+			PreProc   => 'strong',
 		);
 
 		say '<pre>';
@@ -93,30 +117,30 @@ else {
 			my ($type, $contents) = @{$_};
 			$contents = decode_utf8($contents);
 			my $tag = $type && ($TYPETAG{$type} || 'span');
-			my $arg = '';
-			print "<$tag$arg class=\"sy-\l$type\">" if $tag;
-			if (!$type || $type eq 'Constant'
-			and $contents =~ s{^(['"]?)($incname)(?=\1$)}{}) {
-				# link other page sources, stylesheets, and javascript
-				print $1 . showlink($2, "/source/$2");
-			}
-			if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
-				# link perl module names (Xx::Xx...)
-				print $1 . showlink($2, "/source/$2");
-			}
-			if ($type && $type eq 'Comment'
-			and $contents =~ s{^(.*? by )(tools/\S+)}{}) {
-				# link generator scripts (by tools/...)
-				print $1 . showlink($2, "/source/$2");
-			}
-			print Text::VimColor::_xml_escape($contents);
-			print "</$tag>" if $tag;
+			my $line = Text::VimColor::_xml_escape($contents);
+
+			# link other page sources, stylesheets, and javascript
+			$line =~ s{ ^(['"]?) \K ($incname) (?=\1$) }{ showlink($2, "/source/$2") }xe
+				if !$type || $type eq 'Constant';
+			# link relative page locations in html output
+			$line =~ s{ ^(&quot;)\K (/\w+) (?= (?:/\w+)* \1$) }{ showlink($2, "/source$2.plp") }xe
+				if $type && $type eq 'Constant';
+			# link perl module names (Xx::Xx...)
+			$line =~ s{ ^\s* \K ([A-Z]\w+(?:::\w+)+) (?![^;\s]) }{ showlink($1, "/source/$1") }xe
+				if !$type;
+			# link generator scripts (by tools/...)
+			$line =~ s{ ^.*? by\  \K (tools/\S+) }{ showlink($1, "/source/$1") }xe
+				if $type && $type eq 'Comment';
+
+			$line = qq(<$tag class="sy-\l$type">$line</$tag>) if $tag;
+			print $line;
+			print {$cache} $line if $cache;
 		}
 		say '</pre>';
 	}
 	else {
 		say '<pre>';
-		print EscapeHTML(decode_utf8(ReadFile($source)));
+		print EscapeHTML(decode_utf8(ReadFile($path)));
 		say '</pre>';
 	}