X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/05b96f1d0e64293580fd10484092d339b14b56a2..e8e8d5a7167d69ba8ccc16dab1ab39c40899a5b8:/common.inc.plp
diff --git a/common.inc.plp b/common.inc.plp
index fb1d54a..963b8a6 100644
--- a/common.inc.plp
+++ b/common.inc.plp
@@ -4,9 +4,11 @@ use strict;
use warnings;
no warnings 'qw'; # you know what you doing
no warnings 'uninitialized'; # save some useless checks for more legible code
-use open IO => ':utf8';
+use open ':std' => ':utf8';
-use Shiar_Sheet::KeySigns qw(%sign); # dependant on $get{ascii}
+use File::stat 'stat';
+use HTTP::Date;
+use Shiar_Sheet::KeySigns qw(%sign);
our $style;
our $showkeys = !exists $get{keys} ? undef :
@@ -20,25 +22,52 @@ sub stylesheet {
if (exists $get{style}) {
$style = $styles{ $get{style} };
require CGI::Cookie;
- AddCookie(CGI::Cookie->new(
+ if (my $cookie = CGI::Cookie->new(
-name => 'style',
-value => $style,
-path => '/', # site-wide; current page is confusing to most users
-expires => $style ? '+5y' : '-1d',
- )->as_string);
+ )) {
+ AddCookie($cookie->as_string);
+ }
}
$style ||= exists $cookie{style} && $styles{ $cookie{style} } || $_[0];
return join "\n", map { sprintf(
'',
- $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css", $_
+ $_ eq $style ? 'stylesheet' : 'alternate stylesheet', "/$_.css?1.6", $_
) } @_;
}
+sub checkmodified {
+ my $lastmod;
+ for (@_) {
+ my $mod = stat $_ or next;
+ $mod = $mod->mtime or next;
+ $lastmod = $mod if $mod gt $lastmod;
+ }
+
+ for ($ENV{HTTP_IF_MODIFIED_SINCE} || ()) {
+ next if str2time($_) < $lastmod;
+ $header{status} = '304 Same old';
+ exit;
+ }
+
+ $header{'Last-Modified'} = time2str($lastmod);
+}
+
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;
+
# default fallbacks
$meta->{stylesheet} ||= [qw'light dark circus mono red terse'];
$meta->{charset} ||= 'utf-8';
@@ -50,16 +79,16 @@ sub Html {
!$showkeys ? ''
: $showkeys eq 'ghost' ? ''
: (),
- '',
+ '',
) 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->{rawstyle}, $meta->{raw};
+ ref $_ eq 'ARRAY' and $_ = stylesheet(@$_)."\n" for $meta->{stylesheet};
# other vars
- my $sep = $meta->{charset} eq 'utf-8' ? 'â¢' : ' -- ';
my ($file) = $ENV{SCRIPT_FILENAME} =~ m{ ([^/]+) \.plp$ }x;
# leading output
@@ -76,7 +105,7 @@ sub Html {
EOT
- print stylesheet(@$_), "\n" for $meta->{stylesheet} || ();
+ print $_, "\n" for $meta->{stylesheet} || ();
print $_, "\n" for $meta->{raw} || ();
print qq{\n\n\n};
@@ -84,11 +113,11 @@ EOT
PLP_END {
print <<"EOT";