X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/560ad76852eb76efaa7ad860dc03bd9980667345..dc650a4e69e5ed4eb42736e37142393782ef4e04:/common.inc.plp?ds=sidebyside
diff --git a/common.inc.plp b/common.inc.plp
index 02821bb..6ea1197 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,39 +11,46 @@ 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\z}) {
- 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 :
+our $showkeys //= !exists $get{keys} ? undef :
($get{keys} ne '0' && ($get{keys} || 'always'));
$header{content_type} = 'text/html; charset=utf-8';
@@ -59,7 +67,7 @@ sub stylesheet {
my $cookie = CGI::Cookie->new(
-name => 'style',
-value => $setstyle || '',
- -path => '/', # site-wide; current page is confusing to most users
+ -path => '/', # site-wide
-expires => $setstyle ? '+5y' : '-1d',
) or die "empty object returned\n";
AddCookie($cookie->as_string);
@@ -70,7 +78,7 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.13", $_
) } @avail;
}
@@ -91,6 +99,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 $@ 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) = @_;
@@ -101,12 +127,13 @@ sub Html {
(grep { /\bShiar_/ } values %INC),
$meta->{data} ? @{ $meta->{data} } : (),
);
- $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+ $header{'Cache-Control'} = 'max-age='.(24*60*60);
}
# default fallbacks
- $meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
+ $meta->{stylesheet} ||= [qw( light dark circus mono red )];
$meta->{charset} ||= 'utf-8';
+ $meta->{lang} ||= 'en';
# convert options to arrays
ref $_ eq 'ARRAY' or $_ = [$_]
@@ -117,45 +144,53 @@ sub Html {
unless $PLP::sentheaders;
unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+ push @{ $meta->{raw} }, (
+ '',
+ );
+
# optional amends
push @{ $meta->{raw} }, (
'',
'',
- !$showkeys ? ''
- : $showkeys eq 'ghost' ? ''
- : (),
- '',
+ !$showkeys ? '' :
+ $showkeys eq 'ghost' ? '' : (),
+ '',
) if $meta->{keys};
- # leading output
- say '';
- say '';
- say '';
- say '';
- say sprintf '', $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;
+ my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
+
+ 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 {
@@ -166,9 +201,11 @@ sub Html {
version $meta->{version}
created by Shiar â¢
- AGPLv3
+ AGPLv3
EOT
+ our $Time;
say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '';
say '';
@@ -176,11 +213,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(
- $selected ? '%s' : '%s',
- EscapeHTML($title), EscapeHTML($href)
- );
+ EscapeHTML($title);
+ return $title if not $href;
+ return "$title" if $selected;
+ return sprintf '%s', EscapeHTML($href), $title;
}