WIP

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

diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index ea40379ffaa21351880d7f13aebeeebaf1f5f556..fdae8d1e0c4795e93e6340e1405711e33b279d87 100644 (file)
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -120,10 +120,10 @@ sub formbuilder (@) {
        return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ;
 
        my $filename=Encode::decode_utf8($q->param('attachment'));
-       if (defined $filename && length $filename &&
-            ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) {
+       if (defined $filename && length $filename) {
                attachment_store($filename, $form, $q, $params{session});
        }
+
        if ($form->submitted eq "Save Page") {
                attachments_save($form, $params{session});
        }
@@ -153,25 +153,24 @@ sub formbuilder (@) {
        $form->tmpl_param("attachment_list" => [attachment_list($form->field('page'))]);
 }
 
-sub attachment_holding_dir {
+sub attachment_holding_location {
        my $page=attachment_location(shift);
 
-       return $config{wikistatedir}."/attachments/".
+       my $dir=$config{wikistatedir}."/attachments/".
                IkiWiki::possibly_foolish_untaint(linkpage($page));
+       $dir=~s/\/$//;
+       return $dir;
 }
 
-sub remove_held_attachment {
+sub is_held_attachment {
        my $attachment=shift;
 
-       my $f=attachment_holding_dir($attachment);
-       $f=~s/\/$//;
+       my $f=attachment_holding_location($attachment);
        if (-f $f) {
-               require IkiWiki::Render;
-               IkiWiki::prune($f);
-               return 1;
+               return $f
        }
        else {
-               return 0;
+               return undef;
        }
 }
 
@@ -216,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)) {
@@ -241,6 +240,22 @@ sub attachment_store {
                        IkiWiki::fast_file_copy($tempfile, $filename, $fh, @_);
                });
        }
+       
+       # Return JSON response for the jquery file upload widget.
+       eval q{use JSON};
+       error $@ if $@;
+       print "Content-type: application/json\n\n";
+       my $size=-s $dest."/".$filename;
+       print to_json([
+               {
+                       name => $filename,
+                       size => $size,
+                       humansize => IkiWiki::Plugin::filecheck::humansize($size),
+                       stored_msg => stored_msg(),
+                       
+               }
+       ]);
+       exit 0;
 }
 
 # Save all stored attachments for a page.
@@ -250,7 +265,7 @@ 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}."/".
@@ -298,11 +313,12 @@ sub attachment_list ($) {
        my $std=sub {
                my $file=shift;
                my $mtime=shift;
+               my $date=shift;
                my $size=shift;
 
-               "field-select" => '<input type="checkbox" name="attachment_select" value="'.$file.'" />',
+               name => $file,
                size => IkiWiki::Plugin::filecheck::humansize($size),
-               mtime => displaytime($mtime),
+               mtime => $date,
                mtime_raw => $mtime,
        };
 
@@ -312,29 +328,32 @@ sub attachment_list ($) {
                if (! defined pagetype($f) &&
                    $f=~m/^\Q$loc\E[^\/]+$/) {
                        $attachments{$f}={
-                               $std->($f, $IkiWiki::pagemtime{$f}, (stat($f))[7]),
+                               $std->($f, $IkiWiki::pagemtime{$f}, displaytime($IkiWiki::pagemtime{$f}), (stat($f))[7]),
                                link => htmllink($page, $page, $f, noimageinline => 1),
                        };
                }
        }
        
        # attachments in holding directory
-       my $dir=attachment_holding_dir($page);
+       my $dir=attachment_holding_location($page);
        my $heldmsg=gettext("this attachment is not yet saved");
        foreach my $file (glob("$dir/*")) {
-               my $mtime=(stat($file))[9];
-               my $f=$file;
-               $f=~s/^\Q$dir\E\///;
+               next unless -f $file;
+               my $base=IkiWiki::basename($file);
+               my $f=$loc.$base;
                $attachments{$f}={
-                       $std->($page."/".$f, (stat($file))[9], (stat($file))[7]),
-                       link => "<span title=\"$heldmsg\">$f</span>",
+                       $std->($f, (stat($file))[9], stored_msg(), (stat(_))[7]),
+                       link => $base,
                }
        }
 
-       # 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} }
+       # Sort newer attachments to the end of the list.
+       return sort { $a->{mtime_raw} <=> $b->{mtime_raw} || $a->{link} cmp $b->{link} }
                values %attachments;
 }
 
+sub stored_msg {
+       gettext("just uploaded");
+}
+
 1