X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/f96e2754fe0d06d10855b8cb33ad2a707e96edc4..30aead0ab08ff78d7814a17fca4ec3b575b52450:/source.plp

diff --git a/source.plp b/source.plp
index 83a5833..469f49e 100644
--- a/source.plp
+++ b/source.plp
@@ -3,9 +3,32 @@
 my $source = $ENV{PATH_INFO};
 $source =~ s{^/}{};
 
+if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
+	# convert perl include to json construct
+	checkmodified($source);
+	eval {
+		my $data = do $source or die $@ || $! || 'read error';
+		require JSON;
+		my $converter = JSON->new;
+		$converter->utf8->indent->space_after->canonical;
+
+		$header{content_type} = 'application/json';
+		$header{content_type} = 'text/plain' if exists $get{debug};
+		print $_, '(' for $get{callback} // ();
+		print $converter->encode($data);
+		print     ')' for $get{callback} // ();
+		return 1;
+	} or do {
+		$header{status} = '500 File unavailable';
+		$header{content_type} = 'text/plain';
+		print "Conversion failed: $@";
+	};
+	exit;
+}
+
 Html({
 	title => "$source source code",
-	version => 'v1.0',
+	version => 'v1.1',
 	description => !$source ? 'Index of source files for this site.' : [
 		"Source code of the $source file at this site,",
 		"with syntax highlighted and references linked."
@@ -37,7 +60,7 @@ else {
 	}
 	elsif ($source =~ s{::}{/}g or !-e $source) {
 		$source .= '.pm';
-		for (0 .. $#{@INC}) {
+		for (0 .. $#INC) {
 			-e ($_ = "$INC[$_]/$source") or next;
 			$source = $_;
 			last;
@@ -45,6 +68,7 @@ else {
 	}
 	-r $source or die "Requested file not found\n";
 
+	require Encode;
 	if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
 		delete $Text::VimColor::SYNTAX_TYPE{Underlined};
 		my %TYPETAG = (
@@ -60,23 +84,27 @@ else {
 		my $parsed = $hl->marked;
 		print "<pre>\n";
 		foreach (@$parsed) {
-			my $tag = $_->[0] && ($TYPETAG{ $_->[0] } || 'span');
+			my ($type, $contents) = @{$_};
+			$contents = Encode::decode_utf8($contents);
+			my $tag = $type && ($TYPETAG{$type} || 'span');
 			my $arg = '';
-			print "<$tag$arg class=\"sy-\l$_->[0]\">" if $tag;
-			if (!$_->[0] || $_->[0] eq 'Constant'
-			and $_->[1] =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
+			print "<$tag$arg class=\"sy-\l$type\">" if $tag;
+			if (!$type || $type eq 'Constant'
+			and $contents =~ s{^(['"]?)(/?[a-z0-9_.]+\.(?:plp?|css|js))(?=\1$)}{}) {
 				printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
 			}
-			if (!$_->[0] and $_->[1] =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
+			if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
 				printf '%s<a href="%s">%s</a>', $1, "/source/$2", $2;
 			}
-			print Text::VimColor::_xml_escape($_->[1]);
+			print Text::VimColor::_xml_escape($contents);
 			print "</$tag>" if $tag;
 		}
 		print "</pre>\n";
 	}
 	else {
-		print "<pre>\n", EscapeHTML(ReadFile($source)), "</pre>\n";
+		print "<pre>\n";
+		print EscapeHTML(Encode::decode_utf8(ReadFile($source)));
+		print "</pre>\n";
 	}
 
 	print "\n";