X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/11fa40de88d41c209614ad064f71994b1360a5b2..c0b45d8bc967cae8e54c03702e16f52222884867:/common.inc.plp diff --git a/common.inc.plp b/common.inc.plp index 0f79b83..db5177b 100644 --- a/common.inc.plp +++ b/common.inc.plp @@ -1,6 +1,6 @@ <: +use 5.014; use utf8; -use strict; use warnings; no warnings 'qw'; # you know what you doing no warnings 'uninitialized'; # save some useless checks for more legible code @@ -8,13 +8,17 @@ use open ':std' => ':utf8'; use File::stat 'stat'; use HTTP::Date; -use Shiar_Sheet::KeySigns qw(%sign); $PLP::ERROR = sub { my ($text, $html) = @_; print '

Fatal error: '.$html."

\n\n"; }; +BEGIN { + require Time::HiRes; + our $Time = [Time::HiRes::gettimeofday]; +} + our $style; our $showkeys = !exists $get{keys} ? undef : ($get{keys} ne '0' && ($get{keys} || 'always')); @@ -24,24 +28,25 @@ $header{content_type} = 'text/html; charset=utf-8'; sub stylesheet { my %styles = map {$_ => $_} @_; - if (exists $get{style}) { - $style = $styles{ $get{style} }; - require CGI::Cookie; - if (my $cookie = CGI::Cookie->new( - -name => 'style', - -value => $style, - -path => '/', # site-wide; current page is confusing to most users - -expires => $style ? '+5y' : '-1d', - )) { + if (defined( my $setstyle = $get{style} )) { + $style = $styles{ $setstyle }; + eval { + require CGI::Cookie; + my $cookie = CGI::Cookie->new( + -name => 'style', + -value => $setstyle || '', + -path => '/', # site-wide; current page is confusing to most users + -expires => $setstyle ? '+5y' : '-1d', + ) or die "empty object returned\n"; AddCookie($cookie->as_string); - } + } or warn "Unable to create style cookie: $@"; } $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0]; return join "\n", map { sprintf( '', - $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.6", $_ + $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_ ) } @_; } @@ -77,6 +82,8 @@ sub Html { $meta->{stylesheet} ||= [qw'light dark circus mono red terse']; $meta->{charset} ||= 'utf-8'; + ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw}; + # optional amends push @{ $meta->{raw} }, ( '', @@ -99,8 +106,7 @@ sub Html { # leading output $header{content_type} = "text/html; charset=$meta->{charset}"; print <<"EOT"; - + @@ -108,27 +114,41 @@ sub Html { $meta->{title} + EOT print $_, "\n" for $meta->{stylesheet} || (); print $_, "\n" for $meta->{raw} || (); print qq{\n\n\n}; + # dev indicator + my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./; + 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 { print <<"EOT";

sheet.shiar.nl/$file.plp - plp + version $meta->{version} - created by $sign{sep} - Shiar • + AGPLv3 -

- - EOT + say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev; + say '

'; + say ''; + say ''; }; }