X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e73987b01da90374aaaba063e5a36ba61e90aa5f..5c7771e01aafb7b2e197f58a725132e4c2f4bde8:/IkiWiki/Plugin/editpage.pm?ds=inline

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index e07052497..fe2864bac 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -8,6 +8,7 @@ use open qw{:utf8 :std};
 
 sub import { #{{{
 	hook(type => "getsetup", id => "editpage", call => \&getsetup);
+	hook(type => "refresh", id => "editpage", call => \&refresh);
         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);
 } # }}}
 
@@ -19,6 +20,35 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
+sub refresh () {
+	if (exists $wikistate{editpage} && exists $wikistate{editpage}{previews}) {
+		# Expire old preview files after one hour.
+		my $expire=time - (60 * 60);
+
+		my @previews;
+		foreach my $file (@{$wikistate{editpage}{previews}}) {
+			my $mtime=(stat("$config{destdir}/$file"))[9];
+			if (defined $mtime && $mtime <= $expire) {
+				# Avoid deleting a preview that was later saved.
+				my $delete=1;
+				foreach my $page (keys %renderedfiles) {
+					if (grep { $_ eq $file } @{$renderedfiles{$page}}) {
+						$delete=0;
+					}
+				}
+				if ($delete) {
+					debug(sprintf(gettext("removing old preview %s"), $file));
+					IkiWiki::prune("$config{destdir}/$file");
+				}
+			}
+			elsif (defined $mtime) {
+				push @previews, $file;
+			}
+		}
+		$wikistate{editpage}{previews}=\@previews;
+	}
+}
+
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin,
 # and other plugins use the functions below.
@@ -85,13 +115,14 @@ sub cgi_editpage ($$) { #{{{
 	});
 	decode_form_utf8($form);
 	
-	# This untaint is safe because we check file_pruned.
-	my $page=$form->field('page');
+	# This untaint is safe because we check file_pruned and
+	# wiki_file_regexp.
+	my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/;
 	$page=possibly_foolish_untaint($page);
 	my $absolute=($page =~ s#^/+##);
 	if (! defined $page || ! length $page ||
 	    file_pruned($page, $config{srcdir})) {
-		error("bad page name");
+		error(gettext("bad page name"));
 	}
 
 	my $baseurl = urlto($page, undef, 1);
@@ -125,7 +156,7 @@ sub cgi_editpage ($$) { #{{{
 			$type=pagetype($pagesources{$from});
 		}
 		$type=$config{default_pageext} unless defined $type;
-		$file=$page.".".$type;
+		$file=newpagefile($page, $type);
 		if (! $form->submitted) {
 			$form->field(name => "rcsinfo", value => "", force => 1);
 		}
@@ -168,6 +199,7 @@ sub cgi_editpage ($$) { #{{{
 			# temporarily record its type
 			$pagesources{$page}=$page.".".$type;
 		}
+		my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
 		my $content=$form->field('editcontent');
 
@@ -190,11 +222,19 @@ sub cgi_editpage ($$) { #{{{
 			);
 		});
 		$form->tmpl_param("page_preview", $preview);
-	
+		
 		if ($new) {
 			delete $pagesources{$page};
 		}
-		# previewing may have created files on disk
+
+		# Previewing may have created files on disk.
+		# Keep a list of these to be deleted later.
+		my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
+		foreach my $f (@{$renderedfiles{$page}}) {
+			$previews{$f}=1 unless $wasrendered{$f};
+		}
+		@{$wikistate{editpage}{previews}} = keys %previews;
+		$renderedfiles{$page}=[keys %wasrendered];
 		saveindex();
 	}
 	elsif ($form->submitted eq "Save Page") {
@@ -210,7 +250,7 @@ sub cgi_editpage ($$) { #{{{
 			    file_pruned($from, $config{srcdir}) ||
 			    $from=~/^\// || 
 			    $absolute ||
-			    $form->submitted eq "Preview") {
+			    $form->submitted) {
 				@page_locs=$best_loc=$page;
 			}
 			else {