index: bump version to 1.6

[sheet.git] / common.inc.plp

diff --git a/common.inc.plp b/common.inc.plp
index b3a9a70520660bf4fffeb0319a2b826275a8e34b..21cbc0d670a114cacdeeb5324963db7bb6d45170 100644 (file)
--- 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 :
@@ -32,13 +34,38 @@ sub stylesheet {
 
        return join "\n", map { sprintf(
                '<link rel="%s" type="text/css" media="all" href="%s" title="%s">',
-               $_ 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,7 +77,7 @@ sub Html {
                !$showkeys ? '<style type="text/css"> .no {visibility:hidden} </style>'
                        : $showkeys eq 'ghost' ? '<style type="text/css"> .no, .alias {opacity:.5} </style>'
                        : (),
-               '<script type="text/javascript" src="/keys.js"></script>',
+               '<script type="text/javascript" src="/keys.js?1.6"></script>',
        ) if $meta->{keys};
 
        # flatten arrays
@@ -60,7 +87,6 @@ sub Html {
        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
@@ -85,11 +111,11 @@ EOT
        PLP_END {
                print <<"EOT";
 <p class="footer">
-       <a href="/" rel="home">sheet.shiar.nl</a>/$file.<a href="/source/$file.plp"
+       <a href="/" rel="start">sheet.shiar.nl</a>/$file.<a href="/source/$file.plp"
         rel="code" title="Written in Perl">plp</a>
        <a href="http://git.shiar.nl/sheet.git/history/HEAD:/$file.plp"
         rel="vcs-git" title="Git repository">$meta->{version}</a>
-       created by <a href="http://shiar.nl/" rel="author">Shiar</a> $sep
+       created by <a href="http://shiar.nl/" rel="author">Shiar</a> $sign{sep}
        <a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" rel="copyright"
         title="Licensed under the GNU Affero General Public License, version 3">AGPLv3</a>
 </p>