use PublicInbox::LeiCurl;
use PublicInbox::LeiMirror;
use File::Temp ();
+use PublicInbox::Config;
+use IO::Compress::Gzip qw(gzip $GzipError);
sub new { bless {}, __PACKAGE__ }
$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
}
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 {
} 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";
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
} 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?
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;
}
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);
}