From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.1 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C9038203D0 for ; Mon, 28 Nov 2022 05:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1669613571; bh=IHtp2bQMYqcMgoQ4WHlP39WM/GBf0giGH/MweUD6Fs4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=tH7qk+xmohtXIc0psmryEryeD7vqAB4eBtyIzQvE1i31W/A9qUj7DWap4f5DYftZd pjeKduInQpYpLsR4g1PXfxzXXH12SCfawNoBLey7R7csEmB1xvePwsi1RuKyKt5VbU b3M4i/52AVDCDzMkEVgj89vgeeFuWOooUtXZbrDM= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 89/95] lei_mirror: avoid redundant curl `-f' use Date: Mon, 28 Nov 2022 05:32:26 +0000 Message-Id: <20221128053232.291618-90-e@80x24.org> In-Reply-To: <20221128053232.291618-1-e@80x24.org> References: <20221128053232.291618-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: All of our curl invocations use the `-f' (--fail) switch anyways, and I can't imagine a time when we'd want silent failures. --- lib/PublicInbox/LeiMirror.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm index cc5ea1d2..cf4e58f1 100644 --- a/lib/PublicInbox/LeiMirror.pm +++ b/lib/PublicInbox/LeiMirror.pm @@ -51,7 +51,7 @@ sub try_scrape { my $uri = URI->new($self->{src}); my $lei = $self->{lei}; my $curl = $self->{curl} //= PublicInbox::LeiCurl->new($lei) or return; - my $cmd = $curl->for_uri($lei, $uri, qw(-f --compressed)); + my $cmd = $curl->for_uri($lei, $uri, '--compressed'); my $opt = { 0 => $lei->{0}, 2 => $lei->{2} }; my $fh = popen_rd($cmd, undef, $opt); my $html = do { local $/; <$fh> } // die "read(curl $uri): $!"; @@ -151,7 +151,7 @@ sub _get_txt_start { # non-fatal my $f = (split(m!/!, $endpoint))[-1]; my $ft = File::Temp->new(TEMPLATE => "$f-XXXX", TMPDIR => 1); my $opt = { 0 => $lei->{0}, 1 => $lei->{1}, 2 => $lei->{2} }; - my $cmd = $self->{curl}->for_uri($lei, $uri, qw(-f --compressed -R -o), + my $cmd = $self->{curl}->for_uri($lei, $uri, qw(--compressed -R -o), $ft->filename); do_reap($self); $lei->qerr("# @$cmd"); @@ -994,7 +994,7 @@ sub try_manifest { delete $opt{TMPDIR}; } my $ft = File::Temp->new(TEMPLATE => '.manifest-XXXX', %opt); - my $cmd = $curl->for_uri($lei, $uri, qw(-f -R -o), $ft->filename); + my $cmd = $curl->for_uri($lei, $uri, qw(-R -o), $ft->filename); push(@$cmd, '-z', $manifest) if -f $manifest; my $mf_url = "$uri"; %opt = map { $_ => $lei->{$_} } (0..2);