X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a27f4a47ba0435233ed272e2541feab4e0868b32..4879a7f033758c5ae79ff5bf2022245711699c93:/IkiWiki/Plugin/calendar.pm

diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 30e2f26a3..6d536a91b 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -22,16 +22,35 @@ use warnings;
 use strict;
 use IkiWiki 2.00;
 use Time::Local;
+use POSIX;
 
 my %cache;
 my %linkcache;
-my @now=localtime();
+my $time=time;
+my @now=localtime($time);
 
 sub import { #{{{
+	hook(type => "getsetup", id => "calendar", call => \&getsetup);
+	hook(type => "needsbuild", id => "calendar", call => \&needsbuild);
 	hook(type => "preprocess", id => "calendar", call => \&preprocess);
 } #}}}
 
-sub is_leap_year (@) { #{{
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		archivebase => {
+			type => "string",
+			example => "archives",
+			description => "base of the archives hierarchy",
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
+sub is_leap_year (@) { #{{{
 	my %params=@_;
 	return ($params{year} % 4 == 0 && (($params{year} % 100 != 0) || $params{year} % 400 == 0));
 } #}}}
@@ -196,9 +215,9 @@ EOF
         add_depends($params{page}, join(" or ", @list));
 
 	return $calendar;
-}
+} #}}}
 
-sub format_year (@) {
+sub format_year (@) { #{{{
 	my %params=@_;
 
 	my $pagespec = $params{pages};
@@ -299,18 +318,31 @@ EOF
 EOF
 
 	return $calendar;
-}
+} #}}}
 
-sub preprocess (@) {
+sub preprocess (@) { #{{{
 	my %params=@_;
 	$params{pages} = "*"            unless defined $params{pages};
 	$params{type}  = "month"        unless defined $params{type};
-	$params{year}  = 1900 + $now[5] unless defined $params{year};
 	$params{month} = sprintf("%02d", $params{month}) if defined  $params{month};
-	$params{month} = 1    + $now[4] unless defined $params{month};
 	$params{week_start_day} = 0     unless defined $params{week_start_day};
 	$params{months_per_row} = 3     unless defined $params{months_per_row};
 
+	if (! defined $params{year} || ! defined $params{month}) {
+		# Record that the calendar next changes at midnight.
+		$pagestate{$params{destpage}}{calendar}{nextchange}=($time
+			+ (60 - $now[0])		# seconds
+			+ (59 - $now[1]) * 60		# minutes
+			+ (23 - $now[2]) * 60 * 60	# hours
+		);
+		
+		$params{year}  = 1900 + $now[5] unless defined $params{year};
+		$params{month} = 1    + $now[4] unless defined $params{month};
+	}
+	else {
+		delete $pagestate{$params{destpage}}{calendar};
+	}
+
 	# Calculate month names for next month, and previous months
 	my $pmonth = $params{month} - 1;
 	my $nmonth = $params{month} + 1;
@@ -362,7 +394,27 @@ sub preprocess (@) {
 		$calendar=format_year(%params);
 	}
 
-	return "\n<div class=\"calendar\">$calendar</div><!-- calendar -->\n";
-}
+	return "\n<div><div class=\"calendar\">$calendar</div></div>\n";
+} #}}
+
+sub needsbuild (@) { #{{{
+	my $needsbuild=shift;
+	foreach my $page (keys %pagestate) {
+		if (exists $pagestate{$page}{calendar}{nextchange}) {
+			if ($pagestate{$page}{calendar}{nextchange} <= $time) {
+				# force a rebuild so the calendar shows
+				# the current day
+				push @$needsbuild, $pagesources{$page};
+			}
+			if (exists $pagesources{$page} && 
+			    grep { $_ eq $pagesources{$page} } @$needsbuild) {
+				# remove state, will be re-added if
+				# the calendar is still there during the
+				# rebuild
+				delete $pagestate{$page}{calendar};
+			}
+		}
+	}
+} # }}}
 
 1