X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/58725794d72361cc70cb082476a32d08e22d21d0..4e5cd85f8f19880be2521048426d413f4bbb8931:/common.inc.plp?ds=sidebyside
diff --git a/common.inc.plp b/common.inc.plp
index 39865bd..fec7b57 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -50,14 +50,11 @@ 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';
sub stylesheet {
- my ($avail) = @_;
- my @avail = ref $avail eq 'ARRAY' ? @{$avail} : $avail or return;
+ my @avail = qw( light dark circus mono red );
my %styles = map {$_ => $_} @avail;
if (defined( my $setstyle = $get{style} )) {
@@ -74,12 +71,10 @@ sub stylesheet {
} or warn "Unable to create style cookie: $@";
}
- $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $avail[0];
-
- return map { sprintf(
- '',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.13", $_
- ) } @avail;
+ my $setstyle = $style;
+ $style ||= $styles{$_} for $cookie{style} || ();
+ $style ||= $avail[0];
+ return $setstyle;
}
sub checkmodified {
@@ -102,9 +97,13 @@ sub checkmodified {
sub Data {
my ($filename) = @_;
my @data = eval {
- do "$filename.inc.pl";
+ 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]) {
+ if ($@ or !@data or !$data[0]) {
die ['Table data not found', $@ || $!];
}
if (@data == 1 and ref $data[0] eq 'HASH' and not %{$data[0]}) {
@@ -127,8 +126,8 @@ 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 $_ = [$_]
@@ -137,27 +136,35 @@ sub Html {
# document headers before output
$header{content_type} = "text/html; charset=$meta->{charset}"
unless $PLP::sentheaders;
- unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
+ exit if $ENV{REQUEST_METHOD} eq 'HEAD';
- push @{ $meta->{raw} }, (
- '',
+ unshift @{ $meta->{raw} }, (
+ '',
);
+ $meta->{stylesheet} = stylesheet();
- # 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 '';
+ my $rootattr = '';
+ $rootattr .= qq( class="s-$_") for $meta->{stylesheet} || ();
+ say qq();
say '';
say '';
say sprintf '', $_
@@ -171,6 +178,7 @@ sub Html {
say '';
say for map { @{$_} } $meta->{raw} || ();
say '' if $Dev;
+ say '';
say '';
say '';
say sprintf '', $file;
@@ -229,10 +237,9 @@ BEGIN {
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;
}