X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=85f56acbae18e30eed54a52e342cb4a4885fa355;hb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;hp=c93303322194e024b8125b8d8b64ca014fe00483;hpb=e56b908c0e97c2f479b350dfb0868bc463413b89;p=public-inbox.git diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index c9330332..85f56acb 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2018 all contributors +# Copyright (C) 2016-2019 all contributors # License: AGPL-3.0+ # # Represents a public-inbox (which may have multiple mailing addresses) @@ -125,11 +125,11 @@ sub new { bless $opts, $class; } -sub git_part { - my ($self, $part) = @_; +sub git_epoch { + my ($self, $epoch) = @_; ($self->{version} || 1) == 2 or return; - $self->{"$part.git"} ||= eval { - my $git_dir = "$self->{mainrepo}/git/$part.git"; + $self->{"$epoch.git"} ||= eval { + my $git_dir = "$self->{mainrepo}/git/$epoch.git"; my $g = PublicInbox::Git->new($git_dir); $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter}; # no cleanup needed, we never cat-file off this, only clone @@ -149,13 +149,13 @@ sub git { }; } -sub max_git_part { +sub max_git_epoch { my ($self) = @_; my $v = $self->{version}; return unless defined($v) && $v == 2; - my $part = $self->{-max_git_part}; + my $cur = $self->{-max_git_epoch}; my $changed = git($self)->alternates_changed; - if (!defined($part) || $changed) { + if (!defined($cur) || $changed) { $self->git->cleanup if $changed; my $gits = "$self->{mainrepo}/git"; if (opendir my $dh, $gits) { @@ -164,12 +164,12 @@ sub max_git_part { $git_dir =~ m!\A([0-9]+)\.git\z! or next; $max = $1 if $1 > $max; } - $part = $self->{-max_git_part} = $max if $max >= 0; + $cur = $self->{-max_git_epoch} = $max if $max >= 0; } else { warn "opendir $gits failed: $!\n"; } } - $part; + $cur; } sub mm { @@ -191,7 +191,7 @@ sub search ($;$) { my $srch = $self->{search} ||= eval { _cleanup_later($self); require PublicInbox::Search; - PublicInbox::Search->new($self, $self->{altid}); + PublicInbox::Search->new($self); }; ($over_only || eval { $srch->xdb }) ? $srch : undef; }