X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/cd67224be66931c9630e146831bc21ff854cb728..75fc44ce2fa43c984a1920f40d97631ace84d4f6:/IkiWiki/Plugin/calendar.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index a4a54d2c8..6d536a91b 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -26,12 +26,30 @@ 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 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)); @@ -306,12 +324,25 @@ 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; @@ -363,7 +394,27 @@ sub preprocess (@) { #{{{ $calendar=format_year(%params); } - return "\n