X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/2cf450feb990920919389510c5f9ba40ef087474..b1a88e8b8c215a64c86e605de92ae65de4ce014c:/common.inc.plp?ds=sidebyside
diff --git a/common.inc.plp b/common.inc.plp
index 33fad39..4c7fbb9 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -8,18 +8,39 @@ use open ':std' => ':utf8';
use File::stat 'stat';
use HTTP::Date;
-
-$PLP::ERROR = sub {
- my ($text, $html) = @_;
- print '
Fatal error: '.$html."
\n\n";
- warn $text;
-};
+use Encode qw( decode_utf8 );
+
+sub Alert {
+ my ($html, $debug) = @_;
+ ref $html eq 'ARRAY' or $html = [$html];
+ my ($title, @lines) = @{$html};
+ $body = "$title
";
+ $body .= "\n$_
" for @lines;
+ $body .= "\n$debug
" if $Dev and $debug;
+ say "$body
\n";
+}
BEGIN {
require Time::HiRes;
- our $Time = [Time::HiRes::gettimeofday];
+ our $Time = [Time::HiRes::gettimeofday()];
+
+ $PLP::ERROR = sub {
+ my ($text, $html) = @_;
+ warn $text;
+ unless ($PLP::sentheaders and $PLP::sentheaders->[0] !~ m{/PLP\.pm\z}) {
+ Html({nocache => 1});
+ say 'Page unavailable
';
+ }
+ Alert("Fatal error: $html.");
+ };
+
+ # user request
+ our $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
+ our ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
}
+our $Request = decode_utf8($ENV{PATH_INFO} =~ s{^/}{}r);
+
our $style;
our $showkeys = !exists $get{keys} ? undef :
($get{keys} ne '0' && ($get{keys} || 'always'));
@@ -27,7 +48,9 @@ our $showkeys = !exists $get{keys} ? undef :
$header{content_type} = 'text/html; charset=utf-8';
sub stylesheet {
- my %styles = map {$_ => $_} @_;
+ my ($avail) = @_;
+ my @avail = ref $avail eq 'ARRAY' ? @{$avail} : $avail or return;
+ my %styles = map {$_ => $_} @avail;
if (defined( my $setstyle = $get{style} )) {
$style = $styles{ $setstyle };
@@ -43,16 +66,16 @@ sub stylesheet {
} or warn "Unable to create style cookie: $@";
}
- $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
+ $style ||= exists $cookie{style} && $styles{ $cookie{style} } || $avail[0];
- return join "\n", map { sprintf(
+ return map { sprintf(
'',
$_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.9", $_
- ) } @_;
+ ) } @avail;
}
sub checkmodified {
- my $lastmod;
+ my $lastmod = 0;
for (@_) {
my $mod = stat $_ or next;
$mod = $mod->mtime or next;
@@ -71,19 +94,28 @@ sub checkmodified {
sub Html {
my ($meta) = @_;
- # announce and check data modification
- checkmodified(
- $ENV{SCRIPT_FILENAME},
- (grep { /\bShiar_/ } values %INC),
- $meta->{data} ? @{ $meta->{data} } : (),
- );
- $header{'Cache-Control'} = sprintf 'max-age: ', 24*60*60;
+ unless ($meta->{nocache}) {
+ # announce and check data modification
+ checkmodified(
+ $ENV{SCRIPT_FILENAME},
+ (grep { /\bShiar_/ } values %INC),
+ $meta->{data} ? @{ $meta->{data} } : (),
+ );
+ $header{'Cache-Control'} = 'max-age='.(24*60*60);
+ }
# default fallbacks
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$meta->{charset} ||= 'utf-8';
- ref $_ eq 'ARRAY' or $_ = [$_] for $meta->{raw};
+ # convert options to arrays
+ ref $_ eq 'ARRAY' or $_ = [$_]
+ for grep {$_} $meta->{raw}, $meta->{description}, $meta->{keywords};
+
+ # document headers before output
+ $header{content_type} = "text/html; charset=$meta->{charset}"
+ unless $PLP::sentheaders;
+ unshift @{ $meta->{raw} }, stylesheet($meta->{stylesheet});
# optional amends
push @{ $meta->{raw} }, (
@@ -95,34 +127,24 @@ sub Html {
'',
) if $meta->{keys};
- # flatten arrays
- ref $_ eq 'ARRAY' and $_ = join ' ', @$_ for $meta->{description};
- ref $_ eq 'ARRAY' and $_ = join ', ', @$_ for $meta->{keywords};
- ref $_ eq 'ARRAY' and $_ = join "\n", @$_ for $meta->{raw};
- ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
-
- # other vars
- my $Dev = $ENV{HTTP_HOST} =~ /\bdev\./;
- my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
-
# leading output
- $header{content_type} = "text/html; charset=$meta->{charset}";
- print <<"EOT";
-
-
-
-
-
-$meta->{title}
-
-
-
-
-EOT
- say for $meta->{stylesheet} || ();
- say for $meta->{raw} || ();
+ say '';
+ say '';
+ say '';
+ say '';
+ say sprintf '', $header{content_type};
+ say sprintf '%s', $meta->{title};
+ say sprintf '', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '';
+ say '';
+ say for map { @{$_} } $meta->{raw} || ();
say '' if $Dev;
- say qq{\n\n};
+ say '';
+ say '';
+ say sprintf '', $file;
# development version indicator
printf 'beta
', join('; ',
@@ -147,10 +169,18 @@ EOT
AGPLv3
EOT
- say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev;
+ say sprintf '⢠%.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
say '';
say '';
say '';
};
}
+sub showlink {
+ my ($title, $href, $selected) = @_;
+ return sprintf(
+ $selected ? '%s' : '%s',
+ EscapeHTML($title), EscapeHTML($href)
+ );
+}
+