X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/bc57bd1b3634422a37757e5a2d37fdb9565622fb..HEAD:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index 8fc60ef..a634733 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -1,5 +1,6 @@
<:
use 5.014;
+use strict;
use utf8;
use warnings;
no warnings 'qw'; # you know what you doing
@@ -10,40 +11,45 @@ use File::stat 'stat';
use HTTP::Date;
use Encode qw( decode_utf8 );
+our $Dev;
+
sub Alert {
my ($html, $debug) = @_;
ref $html eq 'ARRAY' or $html = [$html];
my ($title, @lines) = @{$html};
- $body = "$title
";
+ my $body = "$title
";
$body .= "\n$_
" for @lines;
$body .= "\n$debug
" if $Dev and $debug;
say "$body
\n";
}
+sub Abort {
+ my ($html, $code, $debug) = @_;
+ unless ($PLP::sentheaders) {
+ $header{Status} = $code || 500;
+ }
+ elsif ($Dev) {
+ ref $html eq 'ARRAY' or $html = [$html];
+ push @{$html}, "Also failed to set HTTP status $code
"
+ . " after output!";
+ }
+ Alert($html, $debug);
+ exit;
+}
+
BEGIN {
require Time::HiRes;
our $Time = [Time::HiRes::gettimeofday()];
- $PLP::ERROR = sub {
- my ($text, $html) = @_;
- warn $text;
- unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm$}) {
- Html({nocache => 1});
- say 'Page unavailable
';
- }
- Alert("Fatal error: $html.");
- };
+ push @INC, '.';
# user request
our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
- our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
}
-our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
+our $Request //= decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
our $style;
-our $showkeys = !exists $get{keys} ? undef :
- ($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
@@ -70,7 +76,7 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.10", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.18", $_
) } @avail;
}
@@ -91,6 +97,24 @@ sub checkmodified {
$header{'Last-Modified'} = time2str($lastmod);
}
+sub Data {
+ my ($filename) = @_;
+ my @data = eval {
+ open my $cache, '<:raw', "data/$filename.json"
+ or return do "./$filename.inc.pl"; # silent fallback to original code
+ require JSON;
+ local $/; # slurp
+ return JSON::decode_json(readline $cache);
+ };
+ if ($@ or !@data or !$data[0]) {
+ die ['Table data not found', $@ || $!];
+ }
+ if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
+ die ['Table data missing'];
+ }
+ return wantarray ? @data : $data[0]; # list compatibility like do does
+}
+
sub Html {
my ($meta) = @_;
@@ -107,6 +131,7 @@ sub Html {
# default fallbacks
$meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
+ $meta->{lang} ||= 'en';
# convert options to arrays
ref $_ eq 'ARRAY' or $_ = [$_]
@@ -115,51 +140,61 @@ sub Html {
# document headers before output
$header{content_type} = "text/html; charset=$meta->{charset}"
unless $PLP::sentheaders;
+ exit if $ENV{REQUEST_METHOD} eq 'HEAD';
unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
push @{ $meta->{raw} }, (
- '',
+ '',
);
- # optional amends
- push @{ $meta->{raw} }, (
- '',
- '',
- !$showkeys ? '' :
- $showkeys eq 'ghost' ? '' : (),
- '',
- ) if $meta->{keys};
-
- # leading output
- say '';
- say '';
- say '';
- say '';
- say sprintf '', $_
- for $header{content_type};
- say sprintf '%s', $meta->{title};
- say sprintf '', EscapeHTML($_)
- for join(' ', @{ $meta->{description} }) || ();
- say sprintf '', EscapeHTML($_)
- for join(', ', @{ $meta->{keywords} }) || ();
- say '';
- say '';
- say for map { @{$_} } $meta->{raw} || ();
- say '' if $Dev;
- say '';
- say '';
- say sprintf '', $file;
-
- # development version indicator
- printf 'beta
', join('; ',
- 'position: fixed',
- 'right: 1em',
- 'opacity: .5',
- 'border: 1ex solid red',
- 'border-width: 1ex 0',
- 'z-index: 1',
- 'background: inherit',
- ) if $Dev;
+ if (my $img = $meta->{image}) {
+ my $proto = sprintf('http%s://', !!$ENV{HTTPS} && 's');
+ my $url = "$proto$ENV{HTTP_HOST}/$img";
+ push @{ $meta->{raw} }, (
+ qq(),
+ );
+ }
+
+ my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
+
+ $meta->{canonical} //= "/$file" . ($Request ne '' && "/$Request");
+ if (my $url = $meta->{canonical}) {
+ $url = "https://sheet.shiar.nl$url";
+ push @{ $meta->{raw} }, qq();
+ }
+
+ PLP_START {
+ # leading output
+ say '';
+ say qq();
+ say '';
+ say '';
+ say sprintf '', $_
+ for $header{content_type};
+ say sprintf '%s', $meta->{title};
+ say sprintf '', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} // [] }) || ();
+ say sprintf '', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} // [] }) || ();
+ say '';
+ say '';
+ say for map { @{$_} } $meta->{raw} || ();
+ say '' if $Dev;
+ say '';
+ say '';
+ say sprintf '', $file;
+
+ # development version indicator
+ printf 'beta
', join('; ',
+ 'position: fixed',
+ 'right: 1em',
+ 'opacity: .5',
+ 'border: 1ex solid red',
+ 'border-width: 1ex 0',
+ 'z-index: 1',
+ 'background: inherit',
+ ) if $Dev;
+ };
# prepare trailing output
PLP_END {
@@ -174,6 +209,7 @@ sub Html {
title="Licensed under the GNU Affero General Public License, version 3"
rel="license">AGPLv3
EOT
+ our $Time;
say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '';
say '';
@@ -181,12 +217,30 @@ EOT
};
}
+BEGIN {
+ $PLP::ERROR = sub {
+ my ($message, $html) = @_;
+ if (ref $message) {
+ warn join ': ', @{$message};
+ $html = shift @{$message};
+ }
+ else {
+ warn $message;
+ $message = [];
+ }
+ unless ($PLP::sentheaders) {
+ Html({nocache => 1});
+ say 'Page unavailable
';
+ }
+ Alert("Fatal error: $html.", @{$message});
+ };
+}
+
sub showlink {
my ($title, $href, $selected) = @_;
- return sprintf(
- !$href ? '%s' :
- $selected ? '%s' : '%s',
- EscapeHTML($title), EscapeHTML($href)
- );
+ EscapeHTML($title);
+ return $title if not $href;
+ return "$title" if $selected;
+ return sprintf '%s', EscapeHTML($href), $title;
}