remove trailing slash from attachment_holding_dir

[ikiwiki.git] / IkiWiki / Plugin / attachment.pm

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index b7ea1f312793b1ea61e44c890c720b537f6d0a6b..4bd08bf7b6da8bf3f0f4b7d6f48efa1ced9eadf0 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -10,7 +10,7 @@ sub import {
        hook(type => "getsetup", id => "attachment", call => \&getsetup);
        hook(type => "checkconfig", id => "attachment", call => \&checkconfig);
        hook(type => "formbuilder_setup", id => "attachment", call => \&formbuilder_setup);
-       hook(type => "formbuilder", id => "attachment", call => \&formbuilder);
+       hook(type => "formbuilder", id => "attachment", call => \&formbuilder, last => 1);
        IkiWiki::loadplugin("filecheck");
 }
 
@@ -103,6 +103,12 @@ sub formbuilder_setup (@) {
                else {
                        $form->tmpl_param("attachments-class" => "toggleable-open");
                }
+               
+               # Save attachments in holding area before previewing so
+               # they can be seen in the preview.
+               if ($form->submitted eq "Preview") {
+                       attachments_save($form, $params{session});
+               }
        }
 }
 
@@ -147,10 +153,25 @@ sub formbuilder (@) {
        $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 }
 
-sub attachment_holding_dir {
-       my $page=shift;
+sub attachment_holding_location {
+       my $page=attachment_location(shift);
 
-       return $config{wikistatedir}."/attachments/$page";
+       my $dir=$config{wikistatedir}."/attachments/".
+               IkiWiki::possibly_foolish_untaint(linkpage($page));
+       $dir=~s/\/$//;
+       return $dir;
+}
+
+sub is_held_attachment {
+       my $attachment=shift;
+
+       my $f=attachment_holding_location($attachment);
+       if (-f $f) {
+               return $f
+       }
+       else {
+               return undef;
+       }
 }
 
 # Stores the attachment in a holding area, not yet in the wiki proper.
@@ -178,11 +199,13 @@ sub attachment_store {
 
        $filename=IkiWiki::basename($filename);
        $filename=~s/.*\\+(.+)/$1/; # hello, windows
+       $filename=IkiWiki::possibly_foolish_untaint(linkpage($filename));
        
        # Check that the user is allowed to edit the attachment.
-       my $final_filename=linkpage(IkiWiki::possibly_foolish_untaint(
-               attachment_location($form->field('page')).
-               $filename));
+       my $final_filename=
+               linkpage(IkiWiki::possibly_foolish_untaint(
+                       attachment_location($form->field('page')))).
+               $filename;
        if (IkiWiki::file_pruned($final_filename)) {
                error(gettext("bad attachment filename"));
        }
@@ -192,7 +215,7 @@ sub attachment_store {
 
        # Move the attachment into holding directory.
        # Try to use a fast rename; fall back to copying.
-       my $dest=attachment_holding_dir($form->field('page'));
+       my $dest=attachment_holding_location($form->field('page'));
        IkiWiki::prep_writefile($filename, $dest);
        unlink($dest."/".$filename);
        if (rename($tempfile, $dest."/".$filename)) {
@@ -212,8 +235,7 @@ sub attachment_store {
                        }
                }
                binmode($fh);
-               # Needed for fast_file_copy.
-               require IkiWiki::Render;
+               require IkiWiki::Render; 
                writefile($filename, $dest, undef, 1, sub {
                        IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
                });
@@ -227,19 +249,20 @@ sub attachments_save {
 
        # Move attachments out of holding directory.
        my @attachments;
-       my $dir=attachment_holding_dir($form->field('page'));
+       my $dir=attachment_holding_location($form->field('page'));
        foreach my $filename (glob("$dir/*")) {
                next unless -f $filename;
                my $dest=$config{srcdir}."/".
                        linkpage(IkiWiki::possibly_foolish_untaint(
-                               attachment_location($form->field('page')).
-                               $filename));
+                               attachment_location($form->field('page')))).
+                       IkiWiki::basename($filename);
                unlink($dest);
                rename($filename, $dest);
                push @attachments, $dest;
        }
        return unless @attachments;
-       rmdir($dir);
+       require IkiWiki::Render;
+       IkiWiki::prune($dir);
 
        # Check the attachments in and trigger a wiki refresh.
        if ($config{rcs}) {
@@ -271,23 +294,47 @@ sub attachment_list ($) {
        my $page=shift;
        my $loc=attachment_location($page);
 
-       my @ret;
+       my $std=sub {
+               my $file=shift;
+               my $mtime=shift;
+               my $size=shift;
+
+               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$file.'" />',
+               size => IkiWiki::Plugin::filecheck::humansize($size),
+               mtime => displaytime($mtime),
+               mtime_raw => $mtime,
+       };
+
+       # attachments already in the wiki
+       my %attachments;
        foreach my $f (values %pagesources) {
                if (! defined pagetype($f) &&
                    $f=~m/^\Q$loc\E[^\/]+$/) {
-                       push @ret, {
-                               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
+                       $attachments{$f}={
+                               $std->($f, $IkiWiki::pagemtime{$f}, (stat($f))[7]),
                                link => htmllink($page, $page, $f, noimageinline => 1),
-                               size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]),
-                               mtime => displaytime($IkiWiki::pagemtime{$f}),
-                               mtime_raw => $IkiWiki::pagemtime{$f},
                        };
                }
        }
+       
+       # attachments in holding directory
+       my $dir=attachment_holding_location($page);
+       my $heldmsg=gettext("this attachment is not yet saved");
+       foreach my $file (glob("$dir/*")) {
+               next unless -f $file;
+               my $mtime=(stat(_))[9];
+               my $base=IkiWiki::basename($file);
+               my $f=$loc.$base;
+               $attachments{$f}={
+                       $std->($f, (stat($file))[9], (stat(_))[7]),
+                       link => "<span title=\"$heldmsg\">$base</span>",
+               }
+       }
 
        # Sort newer attachments to the top of the list, so a newly-added
        # attachment appears just before the form used to add it.
-       return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
+       return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} }
+               values %attachments;
 }
 
 1