X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/b5b60a0ee0f90c2895e1e4e27926840ea29c2be7..3afdb629211b357a3760e14b92e9966b2d414a0d:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 6ea1197..6d6a532 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'; @@ -74,12 +72,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; + $style ||= $styles{$_} for $cookie{style} || (); + my $setstyle = $style; + $style ||= $avail[0]; + return $setstyle; } sub checkmodified { @@ -108,7 +104,7 @@ sub Data { 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]}) { @@ -142,27 +138,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($meta->{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 qq(); + my $rootattr = ''; + $rootattr .= qq( class="s-$_") for $meta->{stylesheet} || (); + say qq(); say ''; say ''; say sprintf '', $_ @@ -176,6 +180,10 @@ sub Html { say ''; say for map { @{$_} } $meta->{raw} || (); say '' if $Dev; + say "" for join($/, + "if (m = window.matchMedia('(monochrome)'))", + "(m.onchange = e => document.documentElement.classList.toggle('s-mono', e.matches))(m);", + ); say ''; say ''; say sprintf '', $file;