aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-10 19:04:18 -0400
committerJoey Hess <joey@kitenet.net>2011-06-10 19:04:18 -0400
commit45fb0371db05027ee0d822264f81a77c02970586 (patch)
tree7035a11922e2ac7b15377a62fcd5e9eb269cb4f5 /IkiWiki
parentd86f248329b1702c5093e0bd8274c3bd3f059ba8 (diff)
downloadikiwiki-45fb0371db05027ee0d822264f81a77c02970586.tar
ikiwiki-45fb0371db05027ee0d822264f81a77c02970586.tar.gz
better long filename detection method
Let's just try to write and fall back to a short ugly filename on error.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/aggregate.pm25
1 files changed, 18 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