multi_git: hoist out common epoch/alternates handling

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

diff --git a/lib/PublicInbox/Fetch.pm b/lib/PublicInbox/Fetch.pm
index 4d50110863769a81e9abe7666aca381d3836acd6..9ea55e9dcf9272d2ddd6e2715433babccc1a80f4 100644 (file)
--- a/lib/PublicInbox/Fetch.pm
+++ b/lib/PublicInbox/Fetch.pm
@@ -6,12 +6,11 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
 use URI ();
-use PublicInbox::Spawn qw(popen_rd);
+use PublicInbox::Spawn qw(popen_rd run_die);
 use PublicInbox::Admin;
 use PublicInbox::LEI;
 use PublicInbox::LeiCurl;
 use PublicInbox::LeiMirror;
-use IO::Uncompress::Gunzip qw(gunzip $GunzipError);
 use File::Temp ();
 
 sub new { bless {}, __PACKAGE__ }
@@ -53,7 +52,6 @@ sub do_manifest ($$$) {
                        PublicInbox::LeiMirror::decode_manifest($fh, $mf, $mf)
                };
                $lei->err($@) if $@;
-               push @opt, '-z', $mf if defined($m0);
        }
        my $curl_cmd = $lei->{curl}->for_uri($lei, $muri, @opt);
        my $opt = {};
@@ -64,11 +62,11 @@ sub do_manifest ($$$) {
                $lei->child_error($cerr, "@$curl_cmd failed");
                return;
        }
-       return [ 304 ] if !-s $ft; # 304 Not Modified via curl -z
        my $m1 = PublicInbox::LeiMirror::decode_manifest($ft, $fn, $muri);
        my $mdiff = { %$m1 };
 
-       # filter out unchanged entries
+       # filter out unchanged entries.  We check modified, too, since
+       # fingerprints are SHA-1, so there's a teeny chance they'll collide
        while (my ($k, $v0) = each %{$m0 // {}}) {
                my $cur = $m1->{$k} // next;
                my $f0 = $v0->{fingerprint} // next;
@@ -77,6 +75,7 @@ sub do_manifest ($$$) {
                my $t1 = $cur->{modified} // next;
                delete($mdiff->{$k}) if $f0 eq $f1 && $t0 == $t1;
        }
+       return unless keys %$mdiff;
        my (undef, $v1_path, @v2_epochs) =
                PublicInbox::LeiMirror::deduce_epochs($mdiff, $ibx_uri->path);
        [ 200, $v1_path, \@v2_epochs, $muri, $ft, $mf ];
@@ -87,15 +86,15 @@ sub do_fetch {
        my $ibx_ver;
        $lei->{curl} //= PublicInbox::LeiCurl->new($lei) or return;
        my $dir = PublicInbox::Admin::resolve_inboxdir($cd, \$ibx_ver);
-       my ($ibx_uri, @git_dir, @epochs);
+       my ($ibx_uri, @git_dir, @epochs, $mg, @new_epoch);
        if ($ibx_ver == 1) {
                my $url = remote_url($lei, $dir) //
                        die "E: $dir missing remote.origin.url\n";
                $ibx_uri = URI->new($url);
        } else { # v2:
-               opendir my $dh, "$dir/git" or die "opendir $dir/git: $!";
-               @epochs = sort { $b <=> $a } map { substr($_, 0, -4) + 0 }
-                                       grep(/\A[0-9]+\.git\z/, readdir($dh));
+               require PublicInbox::MultiGit;
+               $mg = PublicInbox::MultiGit->new($dir, 'all.git', 'git');
+               my @epochs = $mg->git_epochs;
                my ($git_url, $epoch);
                for my $nr (@epochs) { # try newest epoch, first
                        my $edir = "$dir/git/$nr.git";
@@ -118,13 +117,10 @@ EOM
        $lei->qerr("# inbox URL: $ibx_uri/");
        my $res = do_manifest($lei, $dir, $ibx_uri) or return;
        my ($code, $v1_path, $v2_epochs, $muri, $ft, $mf) = @$res;
-       return if $code == 304;
        if ($code == 404) {
                # any pre-manifest.js.gz instances running? Just fetch all
                # existing ones and unconditionally try cloning the next
-               $v2_epochs = [ map {;
-                               "$dir/git/$_.git";
-                               } @epochs ];
+               $v2_epochs = [ map { "$dir/git/$_.git" } @epochs ];
                push @$v2_epochs, "$dir/git/".($epochs[-1] + 1) if @epochs;
        } else {
                $code == 200 or die "BUG unexpected code $code\n";
@@ -155,6 +151,7 @@ EOM
                        $cmd = [ @$torsocks,
                                PublicInbox::LeiMirror::clone_cmd($lei, $opt),
                                $$e_uri, $d];
+                       push @new_epoch, substr($epath, 5, -4) + 0;
                }
                my $cerr = PublicInbox::LeiMirror::run_reap($lei, $cmd, $opt);
                # do not bail on clone failure if we didn't have a manifest
@@ -163,6 +160,7 @@ EOM
                        return;
                }
        }
+       for my $i (@new_epoch) { $mg->epoch_cfg_set($i) }
        if ($ft) {
                my $fn = $ft->filename;
                rename($fn, $mf) or die "E: rename($fn, $mf): $!\n";