<:
+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
use File::stat 'stat';
use HTTP::Date;
+use Encode qw( decode_utf8 );
+
+sub Alert {
+ my ($html, $debug) = @_;
+ ref $html eq 'ARRAY' or $html = [$html];
+ my ($title, @lines) = @{$html};
+ $body = "<h2>$title</h2>";
+ $body .= "\n<p>$_</p>" for @lines;
+ $body .= "\n<pre>$debug</pre>" if $Dev and $debug;
+ say "<div class=error>$body</div>\n";
+}
$PLP::ERROR = sub {
my ($text, $html) = @_;
- print '<p class="error"><strong>Fatal error</strong>: '.$html."</p>\n\n";
+ Alert("<strong>Fatal error</strong>: $html.");
+ warn $text;
};
+BEGIN {
+ require Time::HiRes;
+ our $Time = [Time::HiRes::gettimeofday];
+}
+
+# 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'));
$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 };
} 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(
'<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
$_ 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;
$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};
# optional amends
push @{ $meta->{raw} }, (
'<script type="text/javascript" src="/keys.js?1.6"></script>',
) 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 ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
-
# leading output
$header{content_type} = "text/html; charset=$meta->{charset}";
- print <<"EOT";
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-<meta http-equiv="content-type" content="$header{content_type}">
-<title>$meta->{title}</title>
-<meta name="description" content="$meta->{description}">
-<meta name="keywords" content="$meta->{keywords}">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link rel="icon" type="image/png" href="/clip.png">
-EOT
- print $_, "\n" for $meta->{stylesheet} || ();
- print $_, "\n" for $meta->{raw} || ();
- print qq{</head>\n\n<body id="$file">\n};
-
- # dev indicator
+ say '<!DOCTYPE html>';
+ say '<html lang="en">';
+ say '';
+ say '<head>';
+ say sprintf '<meta http-equiv="content-type" content="%s">', $header{content_type};
+ say sprintf '<title>%s</title>', $meta->{title};
+ say sprintf '<meta name="description" content="%s">', EscapeHTML($_)
+ for join(' ', @{ $meta->{description} }) || ();
+ say sprintf '<meta name="keywords" content="%s">', EscapeHTML($_)
+ for join(', ', @{ $meta->{keywords} }) || ();
+ say '<meta name="viewport" content="width=device-width, initial-scale=1">';
+ say '<link rel="icon" type="image/png" href="/clip.png">';
+ say for stylesheet($meta->{stylesheet});
+ say for map { @{$_} } $meta->{raw} || ();
+ say '<meta name="robots" content="noindex">' if $Dev;
+ say '</head>';
+ say '';
+ say sprintf '<body id="%s">', $file;
+
+ # development version indicator
printf '<p style="%s">beta</p>', join('; ',
'position: fixed',
'right: 1em',
'border-width: 1ex 0',
'z-index: 1',
'background: inherit',
- ) if $ENV{HTTP_HOST} =~ /\bdev\./;
+ ) if $Dev;
# prepare trailing output
PLP_END {
created by <a href="http://shiar.nl/" rel="author">Shiar</a> •
<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="license copyright"
title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
-</p>
-
-</html>
EOT
+ say sprintf '• %.3fs', Time::HiRes::tv_interval($Time) if $Dev and $Time;
+ say '</p>';
+ say '';
+ say '</html>';
};
}
git.shiar.nl / sheet.git / blobdiff