X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/e24a09c638a103745a9b7b7e557d3222de2d1275..HEAD:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index f7ca700..a634733 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -50,8 +50,6 @@ BEGIN {
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';
@@ -78,7 +76,7 @@ sub stylesheet {
return map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.12", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.18", $_
) } @avail;
}
@@ -99,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) = @_;
@@ -115,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 $_ = [$_]
@@ -123,27 +140,33 @@ 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};
+ 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 '';
+ say qq();
say '';
say '';
say sprintf '', $_
@@ -196,22 +219,28 @@ EOT
BEGIN {
$PLP::ERROR = sub {
- my ($text, $html) = @_;
- warn $text;
+ 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.");
+ 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;
}