source: report highlighting errors and delay caching

[sheet.git] / source.plp

diff --git a/source.plp b/source.plp
index b586dbe2b028d439a5ee069b2520cc41c04e3e15..b0b5daa3bd99e545be559af4219b07668cf3da40 100644 (file)
--- a/source.plp
+++ b/source.plp
@@ -29,7 +29,7 @@ if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
 
 Html({
        title => "$source source code",
 
 Html({
        title => "$source source code",

-       version => '1.3',
+       version => '1.4',

        description => !$source ? 'Index of source files for this site.' : [
                "Source code of the $source file at this site,",
                "with syntax highlighted and references linked."
        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 +37,6 @@ Html({
        keywords => [qw'
                sheet cheat source code perl plp html agpl
        '],
        keywords => [qw'
                sheet cheat source code perl plp html agpl
        '],

-       stylesheet => [qw'light dark mono red'],

        data => [$source =~ m{\A($incname)\z}],
 });
 
        data => [$source =~ m{\A($incname)\z}],
 });
 


@@ -83,13 +82,11 @@ else {
        my $cachefile = "source/$source.html";
        if (-e $cachefile and (stat $cachefile)->[9] >= (stat $path)->[9]) {
                say '<pre>';
        my $cachefile = "source/$source.html";
        if (-e $cachefile and (stat $cachefile)->[9] >= (stat $path)->[9]) {
                say '<pre>';

-               print ReadFile($cachefile);
+               print decode_utf8(ReadFile($cachefile));

                say '</pre>';
                exit;
        }
        -e or mkdir for $cachefile =~ s{[^/]+\z}{}r; # dirname
                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';
 
        if (my $hl = eval {
                $size < 32_768 or die 'large files take too long to parse';


@@ -99,7 +96,10 @@ else {
                delete $Text::VimColor::SYNTAX_TYPE{Underlined};
                return Text::VimColor->new(
                        file => $path,
                delete $Text::VimColor::SYNTAX_TYPE{Underlined};
                return Text::VimColor->new(
                        file => $path,

-                       vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+                       vim_options => [@Text::VimColor::VIM_OPTIONS,
+                               '+:set enc=utf-8',
+                               '+:let perl_sub_signatures=1',
+                       ],

                )->marked;
        }) {
                my %TYPETAG = (
                )->marked;
        }) {
                my %TYPETAG = (


@@ -108,6 +108,8 @@ else {
                        Todo      => 'em',
                        PreProc   => 'strong',
                );
                        Todo      => 'em',
                        PreProc   => 'strong',
                );

+               open my $cache, '>', $cachefile
+                       or Alert("Could not save cache", "Opening $cachefile failed: $!");;

 
                say '<pre>';
                foreach (@{$hl}) {
 
                say '<pre>';
                foreach (@{$hl}) {


@@ -119,6 +121,9 @@ else {
                        # link other page sources, stylesheets, and javascript
                        $line =~ s{ ^(['"]?) \K ($incname) (?=\1$) }{ showlink($2, "/source/$2") }xe
                                if !$type || $type eq 'Constant';
                        # 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{2,}) (?= (?:/\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 perl module names (Xx::Xx...)
                        $line =~ s{ ^\s* \K ([A-Z]\w+(?:::\w+)+) (?![^;\s]) }{ showlink($1, "/source/$1") }xe
                                if !$type;


@@ -133,6 +138,7 @@ else {
                say '</pre>';
        }
        else {
                say '</pre>';
        }
        else {

+               warn $@ if $@;

                say '<pre>';
                print EscapeHTML(decode_utf8(ReadFile($path)));
                say '</pre>';
                say '<pre>';
                print EscapeHTML(decode_utf8(ReadFile($path)));
                say '</pre>';