unicode: silence perl warning about empty query range offsets

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index 71c5c1379f29aeb82d6d1211ec53dff69740d2cf..fec7b570a263cd7875aff05418fb0c71d25e2948 100644 (file)
--- 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(
-               '<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-               $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.13", $_
-       ) } @avail;
+       my $setstyle = $style;
+       $style ||= $styles{$_} for $cookie{style} || ();
+       $style ||= $avail[0];
+       return $setstyle;
 }
 
 sub checkmodified {
@@ -99,6 +94,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) = @_;
 
@@ -113,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 $_ = [$_]
@@ -123,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} }, (
-               '<link rel="stylesheet" type="text/css" media="monochrome" href="/mono.css?1.11" title="light">',
+       unshift @{ $meta->{raw} }, (
+               '<link rel="stylesheet" type="text/css" media="all" href="/light.css?1.20">',
        );
+       $meta->{stylesheet} = stylesheet();
 
-       # optional amends
-       push @{ $meta->{raw} }, (
-               '<!--[if lte IE 6]><style> .help dl.legend dt {margin:0 0 1px} </style><![endif]-->',
-               '<!--[if lte IE 7]><style> .help dl.legend dd {float:none} </style><![endif]-->',
-               !$showkeys ? '<style> .no {visibility:hidden} </style>' :
-               $showkeys eq 'ghost' ? '<style> .no, .alias {opacity:.5} </style>' : (),
-               '<script type="text/javascript" src="/keys.js?1.6" async></script>',
-       ) 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(<meta property="og:image" content="$url" />),
+               );
+       }
 
        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(<link rel="canonical" href="$url" />);
+       }
+
        PLP_START {
                # leading output
                say '<!DOCTYPE html>';
-               say '<html lang="en">';
+               my $rootattr = '';
+               $rootattr .= qq( class="s-$_") for $meta->{stylesheet} || ();
+               say qq(<html lang="$meta->{lang}"$rootattr>);
                say '';
                say '<head>';
                say sprintf '<meta http-equiv="content-type" content="%s">', $_
@@ -157,6 +178,7 @@ sub Html {
                say '<link rel="icon" type="image/png" href="/clip.png">';
                say for map { @{$_} } $meta->{raw} || ();
                say '<meta name="robots" content="noindex">' if $Dev;
+               say '<script src="/prefer.js"></script>';
                say '</head>';
                say '';
                say sprintf '<body id="%s">', $file;
@@ -215,10 +237,9 @@ BEGIN {
 
 sub showlink {
        my ($title, $href, $selected) = @_;
-       return sprintf(
-               !$href ? '%s' :
-               $selected ? '<strong>%s</strong>' : '<a href="%2$s">%s</a>',
-               EscapeHTML($title), EscapeHTML($href)
-       );
+       EscapeHTML($title);
+       return $title if not $href;
+       return "<strong>$title</strong>" if $selected;
+       return sprintf '<a href="%s">%s</a>', EscapeHTML($href), $title;
 }