fetch: eliminate File::Temp->filename var

[public-inbox.git] / lib / PublicInbox / Fetch.pm

diff --git a/lib/PublicInbox/Fetch.pm b/lib/PublicInbox/Fetch.pm
index 06ed775f6b274a716dc3b4cce4f3b9fadd56cc9a..198e2a605a0940b7299aa95d6cee6e117e6e8b48 100644 (file)
--- a/lib/PublicInbox/Fetch.pm
+++ b/lib/PublicInbox/Fetch.pm
@@ -2,8 +2,7 @@
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Wrapper to "git fetch" remote public-inboxes
 package PublicInbox::Fetch;
-use strict;
-use v5.10.1;
+use v5.12;
 use parent qw(PublicInbox::IPC);
 use URI ();
 use PublicInbox::Spawn qw(popen_rd run_die spawn);
@@ -15,19 +14,6 @@ use File::Temp ();
 
 sub new { bless {}, __PACKAGE__ }
 
-sub fetch_args ($$) {
-       my ($lei, $opt) = @_;
-       my @cmd; # (git --git-dir=...) to be added by caller
-       $opt->{$_} = $lei->{$_} for (0..2);
-       # we support "-c $key=$val" for arbitrary git config options
-       # e.g.: git -c http.proxy=socks5h://127.0.0.1:9050
-       push(@cmd, '-c', $_) for @{$lei->{opt}->{c} // []};
-       push @cmd, 'fetch';
-       push @cmd, '-q' if $lei->{opt}->{quiet};
-       push @cmd, '-v' if $lei->{opt}->{verbose};
-       @cmd;
-}
-
 sub remote_url ($$) {
        my ($lei, $dir) = @_;
        my $rn = $lei->{opt}->{'try-remote'} // [ 'origin', '_grokmirror' ];
@@ -62,7 +48,6 @@ sub do_manifest ($$$) {
        my $muri = URI->new("$ibx_uri/manifest.js.gz");
        my $ft = File::Temp->new(TEMPLATE => 'm-XXXX',
                                UNLINK => 1, DIR => $dir, SUFFIX => '.tmp');
-       my $fn = $ft->filename;
        my $mf = "$dir/manifest.js.gz";
        my $m0; # current manifest.js.gz contents
        if (open my $fh, '<', $mf) {
@@ -71,7 +56,7 @@ sub do_manifest ($$$) {
                };
                warn($@) if $@;
        }
-       my ($bn) = ($fn =~ m!/([^/]+)\z!);
+       my ($bn) = ($ft->filename =~ m!/([^/]+)\z!);
        my $curl_cmd = $lei->{curl}->for_uri($lei, $muri, qw(-R -o), $bn);
        my $opt = { -C => $dir };
        $opt->{$_} = $lei->{$_} for (0..2);
@@ -82,7 +67,7 @@ sub do_manifest ($$$) {
                return;
        }
        my $m1 = eval {
-               PublicInbox::LeiMirror::decode_manifest($ft, $fn, $muri);
+               PublicInbox::LeiMirror::decode_manifest($ft, $ft, $muri);
        } or return [ 404, $muri ];
        my $mdiff = { %$m1 };
 
@@ -205,7 +190,7 @@ EOM
                if (-d $d) {
                        $fp2->[0] = get_fingerprint2($d) if $fp2;
                        $cmd = [ @$torsocks, 'git', "--git-dir=$d",
-                               fetch_args($lei, $opt) ];
+                              PublicInbox::LeiMirror::fetch_args($lei, $opt)];
                } else {
                        my $e_uri = $ibx_uri->clone;
                        my ($epath) = ($d =~ m!(/git/[0-9]+\.git)\z!);