fetch: support v2 w/o manifest on old WWW

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

diff --git a/lib/PublicInbox/Fetch.pm b/lib/PublicInbox/Fetch.pm
index 464ffe12f3af7b66367ab98626c4233795732355..7881b402e3f6c2b7d870a115b50f30286a029ab4 100644 (file)
--- a/lib/PublicInbox/Fetch.pm
+++ b/lib/PublicInbox/Fetch.pm
@@ -12,6 +12,8 @@ use PublicInbox::LEI;
 use PublicInbox::LeiCurl;
 use PublicInbox::LeiMirror;
 use File::Temp ();
+use PublicInbox::Config;
+use IO::Compress::Gzip qw(gzip $GzipError);
 
 sub new { bless {}, __PACKAGE__ }
 
@@ -58,11 +60,13 @@ sub do_manifest ($$$) {
        $opt->{$_} = $lei->{$_} for (0..2);
        my $cerr = PublicInbox::LeiMirror::run_reap($lei, $curl_cmd, $opt);
        if ($cerr) {
-               return [ 404 ] if ($cerr >> 8) == 22; # 404 Missing
+               return [ 404, $muri ] if ($cerr >> 8) == 22; # 404 Missing
                $lei->child_error($cerr, "@$curl_cmd failed");
                return;
        }
-       my $m1 = PublicInbox::LeiMirror::decode_manifest($ft, $fn, $muri);
+       my $m1 = eval {
+               PublicInbox::LeiMirror::decode_manifest($ft, $fn, $muri);
+       } or return [ 404, $muri ];
        my $mdiff = { %$m1 };
 
        # filter out unchanged entries.  We check modified, too, since
@@ -81,7 +85,7 @@ sub do_manifest ($$$) {
        }
        my (undef, $v1_path, @v2_epochs) =
                PublicInbox::LeiMirror::deduce_epochs($mdiff, $ibx_uri->path);
-       [ 200, $v1_path, \@v2_epochs, $muri, $ft, $mf ];
+       [ 200, $muri, $v1_path, \@v2_epochs, $ft, $mf, $m1 ];
 }
 
 sub get_fingerprint2 {
@@ -104,7 +108,7 @@ sub do_fetch { # main entry point
        } else { # v2:
                require PublicInbox::MultiGit;
                $mg = PublicInbox::MultiGit->new($dir, 'all.git', 'git');
-               my @epochs = $mg->git_epochs;
+               @epochs = $mg->git_epochs;
                my ($git_url, $epoch);
                for my $nr (@epochs) { # try newest epoch, first
                        my $edir = "$dir/git/$nr.git";
@@ -133,7 +137,7 @@ EOM
        PublicInbox::LeiMirror::write_makefile($dir, $ibx_ver);
        $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;
+       my ($code, $muri, $v1_path, $v2_epochs, $ft, $mf, $m1) = @$res;
        if ($code == 404) {
                # any pre-manifest.js.gz instances running? Just fetch all
                # existing ones and unconditionally try cloning the next
@@ -145,6 +149,7 @@ EOM
        } else {
                $code == 200 or die "BUG unexpected code $code\n";
        }
+       my $mculled;
        if ($ibx_ver == 2) {
                defined($v1_path) and warn <<EOM;
 E: got v1 `$v1_path' when expecting v2 epoch(s) in <$muri>, WTF?
@@ -153,6 +158,12 @@ EOM
                                my ($nr) = (m!/([0-9]+)\.git\z!g);
                                $skip->{$nr} ? () : $nr;
                        } @$v2_epochs;
+               if ($m1 && scalar keys %$skip) {
+                       my $re = join('|', keys %$skip);
+                       my @del = grep(m!/git/$re\.git\z!, keys %$m1);
+                       delete @$m1{@del};
+                       $mculled = 1;
+               }
        } else {
                $git_dir[0] = $dir;
        }
@@ -193,6 +204,10 @@ EOM
        for my $i (@new_epoch) { $mg->epoch_cfg_set($i) }
        if ($ft) {
                my $fn = $ft->filename;
+               if ($mculled) {
+                       my $json = PublicInbox::Config->json->encode($m1);
+                       gzip(\$json => $fn) or die "gzip: $GzipError";
+               }
                rename($fn, $mf) or die "E: rename($fn, $mf): $!\n";
                $ft->unlink_on_destroy(0);
        }