about summary refs log tree commit homepage
path: root/lib/PublicInbox/Inbox.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-01-26 01:17:42 +0000
committerEric Wong <e@yhbt.net>2020-01-27 02:58:06 +0000
commit227a1d886672767e37cc86a3432952c14eb8a143 (patch)
treedd4890655f88583a16952c751cf9f4e9e731d224 /lib/PublicInbox/Inbox.pm
parentfcfa0d639da338c470f07942da71f78fa65354a1 (diff)
downloadpublic-inbox-227a1d886672767e37cc86a3432952c14eb8a143.tar.gz
inbox: add ->version method
This allows us to simplify version checking by avoiding
"//" or "||" operators sprinkled around.
Diffstat (limited to 'lib/PublicInbox/Inbox.pm')
-rw-r--r--lib/PublicInbox/Inbox.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 07e8b5b7..b76d4e5a 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -125,9 +125,11 @@ sub new {
         bless $opts, $class;
 }
 
+sub version { $_[0]->{version} // 1 }
+
 sub git_epoch {
         my ($self, $epoch) = @_;
-        ($self->{version} || 1) == 2 or return;
+        $self->version == 2 or return;
         $self->{"$epoch.git"} ||= eval {
                 my $git_dir = "$self->{inboxdir}/git/$epoch.git";
                 my $g = PublicInbox::Git->new($git_dir);
@@ -141,7 +143,7 @@ sub git {
         my ($self) = @_;
         $self->{git} ||= eval {
                 my $git_dir = $self->{inboxdir};
-                $git_dir .= '/all.git' if (($self->{version} || 1) == 2);
+                $git_dir .= '/all.git' if $self->version == 2;
                 my $g = PublicInbox::Git->new($git_dir);
                 $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
                 _cleanup_later($self);
@@ -151,8 +153,7 @@ sub git {
 
 sub max_git_epoch {
         my ($self) = @_;
-        my $v = $self->{version};
-        return unless defined($v) && $v == 2;
+        return if $self->version < 2;
         my $cur = $self->{-max_git_epoch};
         my $changed = git($self)->alternates_changed;
         if (!defined($cur) || $changed) {
@@ -178,7 +179,7 @@ sub mm {
                 require PublicInbox::Msgmap;
                 _cleanup_later($self);
                 my $dir = $self->{inboxdir};
-                if (($self->{version} || 1) >= 2) {
+                if ($self->version >= 2) {
                         PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
                 } else {
                         PublicInbox::Msgmap->new($dir);