po plugin(filter): redesign temp file management

[git.ikiwiki.info.git] / IkiWiki / Plugin / po.pm

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index a5bf4fb5497d13a5121e5efd8fa1678349150dba..38fc7527bcd668e765baa002e1a3f6bbef53d219 100644 (file)
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -112,14 +112,16 @@ sub checkconfig () { #{{{
 sub potfile ($) { #{{{
        my $masterfile=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-       return File::Spec->catfile($dir, $name . ".pot");
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . ".pot");
 } #}}}
 
 sub pofile ($$) { #{{{
        my $masterfile=shift;
        my $lang=shift;
        (my $name, my $dir, my $suffix) = fileparse($masterfile, qr/\.[^.]*/);
-       return File::Spec->catfile($dir, $name . "." . $lang . ".po");
+       $dir='' if $dir eq './';
+       return File::Spec->catpath('', $dir, $name . "." . $lang . ".po");
 } #}}}
 
 sub refreshpot ($) { #{{{
@@ -173,17 +175,22 @@ sub needsbuild () { #{{{
        # refresh/create POT and PO files as needed
        my $updated_po_files=0;
        foreach my $page (keys %pagesources) {
-               my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;
                if (istranslatable($page)) {
+                       my $pageneedsbuild = grep { $_ eq $pagesources{$page} } @$needsbuild;
+                       my $updated_pot_file=0;
                        my $file=srcfile($pagesources{$page});
                        if ($pageneedsbuild || ! -e potfile($file)) {
                                refreshpot($file);
+                               $updated_pot_file=1;
                        }
                        my @pofiles;
                        foreach my $lang (keys %{$config{po_slave_languages}}) {
                                my $pofile=pofile($file, $lang);
-                               if ($pageneedsbuild || ! -e $pofile) {
+                               my $pofile_rel=pofile($pagesources{$page}, $lang);
+                               if ($pageneedsbuild || $updated_pot_file || ! -e $pofile) {
                                        push @pofiles, $pofile;
+                                       push @$needsbuild, $pofile_rel
+                                         unless grep { $_ eq $pofile_rel } @$needsbuild;
                                }
                        }
                        if (@pofiles) {
@@ -194,7 +201,7 @@ sub needsbuild () { #{{{
                }
        }
 
-       # check staged changes in and trigger a wiki refresh.
+       # check staged changes in
        if ($updated_po_files) {
                if ($config{rcs}) {
                        IkiWiki::disable_commit_hook();
@@ -203,8 +210,6 @@ sub needsbuild () { #{{{
                        IkiWiki::enable_commit_hook();
                        IkiWiki::rcs_update();
                }
-               IkiWiki::refresh();
-               IkiWiki::saveindex();
                # refresh module's private variables
                undef %filtered;
                undef %translations;
@@ -213,7 +218,6 @@ sub needsbuild () { #{{{
                }
        }
 
-
        # make existing translations depend on the corresponding master page
        foreach my $master (keys %translations) {
                foreach my $slave (values %{$translations{$master}}) {
@@ -299,10 +303,24 @@ sub filter (@) { #{{{
        # CRLF line terminators make poor Locale::Po4a feel bad
        $content=~s/\r\n/\n/g;
 
-       # Locale::Po4a needs an input file, and I'm too lazy to learn
-       # how to disguise a variable as a file
-       my $infile = File::Temp->new(TEMPLATE => "ikiwiki-po-filter-in.XXXXXXXXXX",
-                                    TMPDIR => 1)->filename;
+       # Implementation notes
+       #
+       # 1. Locale::Po4a reads/writes from/to files, and I'm too lazy
+       #    to learn how to disguise a variable as a file.
+       # 2. There are incompatibilities between some File::Temp versions
+       #    (including 0.18, bundled with Lenny's perl-modules package)
+       #    and others (e.g. 0.20, previously present in the archive as
+       #    a standalone package): under certain circumstances, some
+       #    return a relative filename, whereas others return an absolute one;
+       #    we here use this module in a way that is at least compatible
+       #    with 0.18 and 0.20. Beware, hit'n'run refactorers!
+       my $infile = new File::Temp(TEMPLATE => "ikiwiki-po-filter-in.XXXXXXXXXX",
+                                   DIR => File::Spec->tmpdir,
+                                   UNLINK => 1)->filename;
+       my $outfile = new File::Temp(TEMPLATE => "ikiwiki-po-filter-out.XXXXXXXXXX",
+                                    DIR => File::Spec->tmpdir,
+                                    UNLINK => 1)->filename;
+
        writefile(basename($infile), File::Spec->tmpdir, $content);
 
        my ($masterpage, $lang) = ($page =~ /(.*)[.]([a-z]{2})$/);
@@ -320,10 +338,14 @@ sub filter (@) { #{{{
                'file_in_charset'  => 'utf-8',
                'file_out_charset' => 'utf-8',
        ) or error("[po/filter:$infile]: failed to translate");
-       my $tmpout = File::Temp->new(TEMPLATE => "ikiwiki-po-filter-out.XXXXXXXXXX",
-                                    TMPDIR => 1)->filename;
-       $doc->write($tmpout) or error("[po/filter:$infile] could not write $tmpout");
-       $content = readfile($tmpout) or error("[po/filter:$infile] could not read $tmpout");
+       $doc->write($outfile) or error("[po/filter:$infile] could not write $outfile");
+       $content = readfile($outfile) or error("[po/filter:$infile] could not read $outfile");
+
+       # Unlinking should happen automatically, thanks to File::Temp,
+       # but it does not work here, probably because of the way writefile()
+       # and Locale::Po4a::write() work.
+       unlink $infile, $outfile;
+
        $filtered{$page}{$destpage}=1;
        return $content;
 } #}}}