urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

attachment list includes new attachments in holding area 

Note that it's possible for an attachment in the holding area to be older
than an attachemnt in the wiki with the same name. I intentionally
show the one in the holding area in this (unlikely) case, since saving the
page will overwrite the wiki's file with the held attachment. It does not
seem worth the bother of doing something more intelligent, since in this
case two people have basically conflicted with one-another.. and both
attachment contents will be stored in revision control in case it needs to
be sorted out.

I had to remove the hyperlink for attachments in the holding area, since
they're not yet live on the web. This could be annoying/confusing. Added
a moseover notice instead.
master
Joey Hess 2011-06-14 13:49:41 -04:00
parent 8619faaa8b
commit e2cb19ed9e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IkiWiki/Plugin/attachment.pm
View File

@ -274,11 +274,12 @@ sub attachment_list ($) {
my $page=shift; my $page=shift;
my $loc=attachment_location($page); my $loc=attachment_location($page);
my @ret; # attachments already in the wiki
my %attachments;
foreach my $f (values %pagesources) { foreach my $f (values %pagesources) {
if (! defined pagetype($f) && if (! defined pagetype($f) &&
$f=~m/^\Q$loc\E[^\/]+$/) { $f=~m/^\Q$loc\E[^\/]+$/) {
push @ret, { $attachments{$f}={
"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />', "field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
link => htmllink($page, $page, $f, noimageinline => 1), link => htmllink($page, $page, $f, noimageinline => 1),
size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]), size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]),
@ -288,9 +289,24 @@ sub attachment_list ($) {
} }
} }
# attachments in holding directory
my $dir=attachment_holding_dir($page);
foreach my $file (glob("$dir/*")) {
my $mtime=(stat($file))[9];
my $f=IkiWiki::basename($file);
$attachments{$f}={
"field-select" => '<input type="checkbox" name="attachment_select" value="'.$f.'" />',
link => $f, # no link possible
size => IkiWiki::Plugin::filecheck::humansize((stat($file))[7]),
mtime => displaytime($mtime),
mtime_raw => $mtime,
}
}
# Sort newer attachments to the top of the list, so a newly-added # Sort newer attachments to the top of the list, so a newly-added
# attachment appears just before the form used to add it. # 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 1