diff options
| -rw-r--r-- | IkiWiki/Plugin/aggregate.pm | 25 | ||||
| -rw-r--r-- | doc/bugs/aggregate_generates_long_filenames.mdwn | 3 |
2 files changed, 21 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 7f50b54f0..5e22609c9 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -614,6 +614,7 @@ sub add_page (@) { # updating an existing post $guid=$guids{$params{guid}}; return if $guid->{expired}; + write_page($feed, $guid, $mtime, \%params); } else { # new post @@ -640,23 +641,33 @@ sub add_page (@) { $c++ } - # Make sure that the file name isn't too long. - # NB: This doesn't check for path length limits. - my $max=POSIX::pathconf($config{srcdir}, &POSIX::_PC_NAME_MAX); - if (defined $max && length(htmlfn($page).".ikiwiki-new") >= $max) { + $guid->{page}=$page; + eval { write_page($feed, $guid, $mtime, \%params) }; + if ($@) { + # assume failure was due to a too long filename + # (or o $c=""; $page=$feed->{dir}."/item"; while (exists $IkiWiki::pagecase{lc $page.$c} || -e $IkiWiki::Plugin::transient::transientdir."/".htmlfn($page.$c) || - - -e "$config{srcdir}/".htmlfn($page.$c)) { + -e "$config{srcdir}/".htmlfn($page.$c)) { $c++ } + + $guid->{page}=$page; + write_page($feed, $guid, $mtime, \%params); } - $guid->{page}=$page; debug(sprintf(gettext("creating new page %s"), $page)); } +} + +sub write_page ($$$$$) { + my $feed=shift; + my $guid=shift; + my $mtime=shift; + my %params=%{shift()}; + $guid->{feed}=$feed->{name}; # To write or not to write? Need to avoid writing unchanged pages diff --git a/doc/bugs/aggregate_generates_long_filenames.mdwn b/doc/bugs/aggregate_generates_long_filenames.mdwn index fae8333ab..33c300bd2 100644 --- a/doc/bugs/aggregate_generates_long_filenames.mdwn +++ b/doc/bugs/aggregate_generates_long_filenames.mdwn @@ -35,3 +35,6 @@ It would also appear this abrubtly terminates aggregate processing (if not ikiwi >>> Path length seems unlikely, since the max is 4096 there. >>> --[[Joey]] + +>>>> Aggregate now used a "if it crashes, it must be too long" strategy. +>>>> [[done]] --[[Joey]] |