From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 29 Sep 2008 17:25:31 +0000 (-0400)
Subject: fix handing of case of file first created by preview but then saved
X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/commitdiff_plain/c4be16703fa571e8922b43446b24cf1c4f90a371

fix handing of case of file first created by preview but then saved

To handle this, avoid populating %renderedfiles in preview,
and in expiry, check if the file is in %renderedfiles, if it is
do not delete it since it was saved.
---

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index d12c6732d..8ab02cabc 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -29,8 +29,17 @@ sub refresh () {
 		foreach my $file (@{$wikistate{editpage}{previews}}) {
 			my $mtime=(stat("$config{destdir}/$file"))[9];
 			if (defined $mtime && $mtime <= $expire) {
-				debug(sprintf(gettext("removing old preview %s"), $file));
-				IkiWiki::prune("$config{destdir}/$file");
+				# 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;
@@ -225,6 +234,7 @@ sub cgi_editpage ($$) { #{{{
 			$previews{$file}=1 unless $wasrendered{$file};
 		}
 		@{$wikistate{editpage}{previews}} = keys %previews;
+		$renderedfiles{$page}=[keys %wasrendered];
 		saveindex();
 	}
 	elsif ($form->submitted eq "Save Page") {