urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

store state to avoid needing to rebuild when changing theme

master
Joey Hess 2010-06-18 16:40:47 -04:00
parent cfcc79ed4c
commit 57e56828f5
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IkiWiki/Plugin/theme.pm
View File

@ -8,6 +8,7 @@ use IkiWiki 3.00;
sub import {
hook(type => "getsetup", id => "theme", call => \&getsetup);
hook(type => "checkconfig", id => "theme", call => \&checkconfig);
hook(type => "needsbuild", id => "theme", call => \&needsbuild);
}
sub getsetup () {
@ -22,7 +23,7 @@ sub getsetup () {
example => "actiontabs",
description => "name of theme to enable",
safe => 1,
rebuild => 1,
rebuild => 0,
},
}
@ -34,4 +35,31 @@ sub checkconfig () {
}
}
sub needsbuild ($) {
my $needsbuild=shift;
if (($config{theme} || '') ne ($wikistate{theme}{currenttheme} || '')) {
# theme changed; ensure all files in the theme are built
my %needsbuild=map { $_ => 1 } @$needsbuild;
if ($config{theme}) {
foreach my $file (glob("$config{underlaydirbase}/themes/$config{theme}/*")) {
if (-f $file) {
my $f=IkiWiki::basename($file);
push @$needsbuild, $f
unless $needsbuild{$f};
}
}
}
elsif ($wikistate{theme}{currenttheme}) {
foreach my $file (glob("$config{underlaydirbase}/themes/$wikistate{theme}{currenttheme}/*")) {
my $f=IkiWiki::basename($file);
if (-f $file && defined eval { srcfile($f) }) {
push @$needsbuild, $f;
}
}
}
$wikistate{theme}{currenttheme}=$config{theme};
}
}
1

1
doc/bugs/underlaydir_file_expose.mdwn
View File

@ -9,4 +9,5 @@ gets rebuilt.)
> A related problem occurs if changing a site's theme with the
> [[plugins/theme]] plugin. The style.css of the old and new theme
> often has the same mtime, so ikiwiki does not update it w/o a rebuild.
> This is worked around in theme.pm with a special-purpose needsbuild hook.
> --[[Joey]]