updated from pesco's darcs repo, current to Oct 11 version

[git.ikiwiki.info.git] / IkiWiki / Plugin / editpage.pm

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index d12c6732de2b317da24fa0360967ca6fb19acb00..30c93df20961090f0bc1e278d0bbf0e5685ecbbb 100644 (file)
--- 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;
@@ -147,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);
                }
@@ -221,10 +230,11 @@ sub cgi_editpage ($$) { #{{{
                # 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 $file (@{$renderedfiles{$page}}) {
-                       $previews{$file}=1 unless $wasrendered{$file};
+               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") {
@@ -240,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 {