X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/59b46942e01b32138d056381249effbbaf773892..849b5446fa7279c99242c5cfe457deee0b9165c6:/IkiWiki/Plugin/calendar.pm diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 6fcd8c2ca..c03b89667 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -1,4 +1,4 @@ -#! /usr/bin/perl +#!/usr/bin/perl # Copyright (c) 2006, 2007 Manoj Srivastava # # This program is free software; you can redistribute it and/or modify @@ -25,6 +25,7 @@ use Time::Local; my $time=time; my @now=localtime($time); +my %changed; sub import { hook(type => "checkconfig", id => "calendar", call => \&checkconfig); @@ -32,6 +33,9 @@ sub import { hook(type => "needsbuild", id => "calendar", call => \&needsbuild); hook(type => "preprocess", id => "calendar", call => \&preprocess); hook(type => "scan", id => "calendar", call => \&scan); + hook(type => "build_affected", id => "calendar", call => \&build_affected); + + IkiWiki::loadplugin("transient"); } sub getsetup () { @@ -63,14 +67,6 @@ sub getsetup () { safe => 1, rebuild => undef, }, - calendar_autocreate_commit => { - type => "boolean", - example => 1, - default => 1, - description => "commit autocreated calendar pages", - safe => 1, - rebuild => 0, - }, calendar_fill_gaps => { type => "boolean", example => 1, @@ -83,10 +79,7 @@ sub getsetup () { sub checkconfig () { if (! defined $config{calendar_autocreate}) { - $config{calendar_autocreate} = defined $config{archivebase} || defined $config{calendar_autocreate_commit}; - } - if (! defined $config{calendar_autocreate_commit}) { - $config{calendar_autocreate_commit} = 1; + $config{calendar_autocreate} = defined $config{archivebase}; } if (! defined $config{archive_pagespec}) { $config{archive_pagespec} = '*'; @@ -113,6 +106,26 @@ sub month_days { return $days_in_month; } +sub build_affected { + my %affected; + my ($ayear, $amonth, $valid); + + foreach my $year (keys %changed) { + ($ayear, $valid) = nextyear($year, $config{archivebase}); + $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); + ($ayear, $valid) = previousyear($year, $config{archivebase}); + $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); + foreach my $month (keys %{$changed{$year}}) { + ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase}); + $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid); + ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase}); + $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid); + } + } + + return %affected; +} + sub autocreate { my ($page, $pagefile, $year, $month) = @_; my $message=sprintf(gettext("creating calendar page %s"), $page); @@ -128,18 +141,9 @@ sub autocreate { $template->param(month => $month) if defined $month; $template->param(pagespec => $config{archive_pagespec}); - my $dir = $config{srcdir}; - if (! $config{calendar_autocreate_commit}) { - $dir = $IkiWiki::Plugin::transient::transientdir; - } + my $dir = $IkiWiki::Plugin::transient::transientdir; writefile($pagefile, $dir, $template->output); - if ($config{rcs} && $config{calendar_autocreate_commit}) { - IkiWiki::disable_commit_hook(); - IkiWiki::rcs_add($pagefile); - IkiWiki::rcs_commit_staged(message => $message); - IkiWiki::enable_commit_hook(); - } } sub calendarlink($;$) { @@ -167,8 +171,6 @@ sub gencalendaryear { my $year = shift; my %params = @_; - return unless $config{calendar_autocreate}; - # Building year page my $page = calendarlink($year); my $pagefile = newpagefile($page, $config{default_pageext}); @@ -191,7 +193,7 @@ sub gencalendaryear { } # Filling potential gaps in years (e.g. calendar goes from 2010 to 2014, - # and we just added year 2005. We have to had years 2006 to 2009). + # and we just added year 2005. We have to add years 2006 to 2009). return if $params{norecurse}; if ($wikistate{calendar}{minyear} > $year) { foreach my $other ($year + 1 .. $wikistate{calendar}{minyear} - 1) { @@ -214,6 +216,74 @@ sub gencalendaryear { } } +sub previousmonth($$$) { + my $year = shift; + my $month = shift; + my $archivebase = shift; + + if (not exists $wikistate{calendar}{minyear}) { + $wikistate{calendar}{minyear} = $year; + } + + my $pmonth = $month; + my $pyear = $year; + while ((not exists $pagesources{"$archivebase/$pyear/" . sprintf("%02d", $pmonth)}) or ($pmonth == $month and $pyear == $year)) { + $pmonth -= 1; + if ($pmonth == 0) { + $pyear -= 1; + $pmonth = 12; + return ($pyear, $pmonth, 0) unless $pyear >= $wikistate{calendar}{minyear}; + } + } + return ($pyear, $pmonth, 1); +} + +sub nextmonth($$$) { + my $year = shift; + my $month = shift; + my $archivebase = shift; + + if (not exists $wikistate{calendar}{maxyear}) { + $wikistate{calendar}{maxyear} = $year; + } + + my $nmonth = $month; + my $nyear = $year; + while ((not exists $pagesources{"$archivebase/$nyear/" . sprintf("%02d", $nmonth)}) or ($nmonth == $month and $nyear == $year)) { + $nmonth += 1; + if ($nmonth == 13) { + $nyear += 1; + $nmonth = 1; + return ($nyear, $nmonth, 0) unless $nyear <= $wikistate{calendar}{maxyear}; + } + } + return ($nyear, $nmonth, 1); +} + +sub previousyear($$) { + my $year = shift; + my $archivebase = shift; + + my $pyear = $year - 1; + while (not exists $pagesources{"$archivebase/$pyear"}) { + $pyear -= 1; + return ($pyear, 0) unless ($pyear >= $wikistate{calendar}{minyear}); + } + return ($pyear, 1); +} + +sub nextyear($$) { + my $year = shift; + my $archivebase = shift; + + my $nyear = $year + 1; + while (not exists $pagesources{"$archivebase/$nyear"}) { + $nyear += 1; + return ($nyear, 0) unless ($nyear <= $wikistate{calendar}{maxyear}); + } + return ($nyear, 1); +} + sub format_month (@) { my %params=@_; @@ -239,26 +309,9 @@ sub format_month (@) { my $archivebase = 'archives'; $archivebase = $config{archivebase} if defined $config{archivebase}; $archivebase = $params{archivebase} if defined $params{archivebase}; - - my $pmonth = $params{month}; - my $pyear = $params{year}; - while (((not exists $pagesources{"$archivebase/$pyear/" . sprintf("%02d", $pmonth)}) and ($pyear >= $wikistate{calendar}{minyear})) or ($pmonth == $params{month} and $pyear == $params{year})) { - $pmonth -= 1; - if ($pmonth == 0) { - $pyear -= 1; - $pmonth = 12; - } - } - - my $nmonth = $params{month}; - my $nyear = $params{year}; - while (((not exists $pagesources{"$archivebase/$nyear/" . sprintf("%02d", $nmonth)}) and ($nyear <= $wikistate{calendar}{maxyear})) or ($nmonth == $params{month} and $nyear == $params{year})) { - $nmonth += 1; - if ($nmonth == 13) { - $nyear += 1; - $nmonth = 1; - } - } + + my ($pyear, $pmonth, $pvalid) = previousmonth($params{year}, $params{month}, $archivebase); + my ($nyear, $nmonth, $nvalid) = nextmonth($params{year}, $params{month}, $archivebase); # Add padding. $pmonth=sprintf("%02d", $pmonth); @@ -434,7 +487,6 @@ sub format_year (@) { my $mtime = $IkiWiki::pagectime{$p}; my @date = localtime($mtime); my $month = $date[4] + 1; - my $year = $date[5] + 1900; $post_months[$month]++; } @@ -445,14 +497,8 @@ sub format_year (@) { $archivebase = $config{archivebase} if defined $config{archivebase}; $archivebase = $params{archivebase} if defined $params{archivebase}; - my $pyear = $params{year} - 1; - while ((not exists $pagesources{"$archivebase/$pyear"}) and ($pyear > $wikistate{calendar}{minyear})) { - $pyear -= 1; - } - my $nyear = $params{year} + 1; - while ((not exists $pagesources{"$archivebase/$nyear"}) and ($nyear < $wikistate{calendar}{maxyear})) { - $nyear += 1; - } + my ($pyear, $pvalid) = previousyear($params{year}, $archivebase); + my ($nyear, $nvalid) = nextyear($params{year}, $archivebase); my $thisyear = $now[5]+1900; my $future_month = 0; @@ -587,6 +633,7 @@ sub preprocess (@) { } $params{month} = sprintf("%02d", $params{month}); + $changed{$params{year}}{$params{month}} = 1; if ($params{type} eq 'month' && $params{year} == $thisyear && $params{month} == $thismonth) { @@ -672,6 +719,8 @@ sub scan (@) { my %params=@_; my $page=$params{page}; + return unless $config{calendar_autocreate}; + # Check if year pages have to be generated if (pagespec_match($page, $config{archive_pagespec})) { my @ctime = localtime($IkiWiki::pagectime{$page});