git.shiar.nl
/
sheet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
word edit: recover form after save error
[sheet.git]
/
source.plp
diff --git
a/source.plp
b/source.plp
index 7facf51a885f7662c1126a514df9f33696662822..72fdf825e5bffbdc17996e60cfc21ec79e020f00 100644
(file)
--- a/
source.plp
+++ b/
source.plp
@@
-1,7
+1,7
@@
<(common.inc.plp)><:
<(common.inc.plp)><:
-my $source = $
ENV{PATH_INFO}
;
-
$source =~ s{^/}{}
;
+my $source = $
Request
;
+
my $incname = qr{ [a-z][/a-z0-9_.-]* \.(?:plp?|css|js|txt) }x
;
if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
# convert perl include to json construct
if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
# convert perl include to json construct
@@
-28,7
+28,7
@@
if ($source =~ s{(?<=\Q.inc.pl\E)/jsonp?$}{} and -r $source) {
Html({
title => "$source source code",
Html({
title => "$source source code",
- version => '1.
1
',
+ version => '1.
2
',
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,26
+37,30
@@
Html({
sheet cheat source code perl plp html agpl
'],
stylesheet => [qw'light dark mono red'],
sheet cheat source code perl plp html agpl
'],
stylesheet => [qw'light dark mono red'],
+ data => [$source =~ m{\A($incname)\z}],
});
});
-
print "\n"
;
+
say ''
;
if (not $source) {
print "<h1>Source files</h1>";
print "<p>Project code distributed under the AGPL. Please contribute back.</p>";
if (not $source) {
print "<h1>Source files</h1>";
print "<p>Project code distributed under the AGPL. Please contribute back.</p>";
-
print '<ul>'."\n"
;
+
say '<ul>'
;
for (glob '*.plp') {
chomp;
for (glob '*.plp') {
chomp;
-
printf '<li><a href="/source/%s">%1$s</a></li>'."\n", EscapeHTML($_
);
+
say '<li>', showlink($_, "/source/$_"
);
}
}
-
print "</ul>\n
\n";
+
say "</ul>
\n";
}
else {
}
else {
- print "<h1>Source of $source</h1>\n";
+ my $href = showlink($source, $source =~ m{\A (\w+) \.plp \z}x && "/$1");
+ PLP_START {
+ say "<h1>Source of $href</h1>";
+ };
if ($source =~ m{(?:/|^)\.}) {
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';
}
elsif ($source =~ s{::}{/}g or !-e $source) {
$source .= '.pm';
@@
-66,54
+70,58
@@
else {
last;
}
}
last;
}
}
- -r $source or die "Requested file not found\n";
+ -r $source or Abort("Requested file not found", '404 source not found');
+ my $size = (stat $source)->[7];
- require Encode;
- if (eval { require Text::VimColor and Text::VimColor->VERSION(0.12) }) {
+ if (my $hl = eval {
+ $size < 32_768 or die 'large files take too long to parse';
+ require Text::VimColor;
+ Text::VimColor->VERSION(0.12)
+ or die 'early versions are buggy under FastCGI';
delete $Text::VimColor::SYNTAX_TYPE{Underlined};
delete $Text::VimColor::SYNTAX_TYPE{Underlined};
+ return Text::VimColor->new(
+ file => $source,
+ vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
+ )->marked;
+ }) {
my %TYPETAG = (
Statement => 'strong',
Error => 'em',
Todo => 'em',
);
my %TYPETAG = (
Statement => 'strong',
Error => 'em',
Todo => 'em',
);
- my $hl = Text::VimColor->new(
- file => $source,
- vim_options => [@Text::VimColor::VIM_OPTIONS, '+:set enc=utf-8'],
- );
- my $parsed = $hl->marked;
- print "<pre>\n";
- foreach (@$parsed) {
+ say '<pre>';
+ foreach (@{$hl}) {
my ($type, $contents) = @{$_};
my ($type, $contents) = @{$_};
- $contents =
Encode::
decode_utf8($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'
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{^(['"]?)(
/?[a-z0-9_.]+\.(?:plp?|css|js)
)(?=\1$)}{}) {
+ and $contents =~ s{^(['"]?)(
$incname
)(?=\1$)}{}) {
# link other page sources, stylesheets, and javascript
# link other page sources, stylesheets, and javascript
- print
f '%s<a href="%s">%s</a>', $1, "/source/$2", $2
;
+ print
$1 . showlink($2, "/source/$2")
;
}
if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
# link perl module names (Xx::Xx...)
}
if (!$type and $contents =~ s/^(\s*)([A-Z]\w+(?:::\w+)+)(?![^;\s])//) {
# link perl module names (Xx::Xx...)
- print
f '%s<a href="%s">%s</a>', $1, "/source/$2", $2
;
+ print
$1 . showlink($2, "/source/$2")
;
}
if ($type && $type eq 'Comment'
and $contents =~ s{^(.*? by )(tools/\S+)}{}) {
# link generator scripts (by tools/...)
}
if ($type && $type eq 'Comment'
and $contents =~ s{^(.*? by )(tools/\S+)}{}) {
# link generator scripts (by tools/...)
- print
f '%s<a href="%s">%s</a>', $1, "/source/$2", $2
;
+ print
$1 . showlink($2, "/source/$2")
;
}
print Text::VimColor::_xml_escape($contents);
print "</$tag>" if $tag;
}
}
print Text::VimColor::_xml_escape($contents);
print "</$tag>" if $tag;
}
-
print "</pre>\n"
;
+
say '</pre>'
;
}
else {
}
else {
-
print "<pre>\n"
;
- print EscapeHTML(
Encode::
decode_utf8(ReadFile($source)));
-
print "</pre>\n"
;
+
say '<pre>'
;
+ print EscapeHTML(decode_utf8(ReadFile($source)));
+
say '</pre>'
;
}
}
-
print "\n"
;
+
say ''
;
}
}