t/watch_maildir: support non-master default branch

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 978730e2fe59deb6966acaf37f0bc3596eb0c402..699a8bf0d9cda0d12ae618948f824c8a0c17f651 100644 (file)
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -14,19 +14,17 @@ use DBI;
 use DBD::SQLite;
 use PublicInbox::Over;
 use PublicInbox::Spawn;
-
-sub new {
-       my ($class, $git_dir, $writable) = @_;
-       my $d = "$git_dir/public-inbox";
-       if ($writable && !-d $d && !mkdir $d) {
-               my $err = $!;
-               -d $d or die "$d not created: $err";
-       }
-       new_file($class, "$d/msgmap.sqlite3", $writable);
-}
+use Scalar::Util qw(blessed);
 
 sub new_file {
-       my ($class, $f, $rw) = @_;
+       my ($class, $ibx, $rw) = @_;
+       my $f;
+       if (blessed($ibx)) {
+               $f = $ibx->mm_file;
+               $rw = 2 if $rw && $ibx->{-no_fsync};
+       } else {
+               $f = $ibx;
+       }
        return if !$rw && !-r $f;
 
        my $self = bless { filename => $f }, $class;
@@ -34,8 +32,15 @@ sub new_file {
        if ($rw) {
                $dbh->begin_work;
                create_tables($dbh);
-               $self->created_at(time) unless $self->created_at;
+               unless ($self->created_at) {
+                       my $t;
 
+                       if (blessed($ibx) &&
+                               -f "$ibx->{inboxdir}/inbox.config.example") {
+                               $t = (stat(_))[9]; # mtime set by "curl -R"
+                       }
+                       $self->created_at($t // time);
+               }
                $self->num_highwater(max($self));
                $dbh->commit;
        }
@@ -95,13 +100,12 @@ sub created_at {
 
 sub num_highwater {
        my ($self, $num) = @_;
-       my $high = $self->{num_highwater} ||=
-           $self->meta_accessor('num_highwater');
+       my $high = $self->meta_accessor('num_highwater');
        if (defined($num) && (!defined($high) || ($num > $high))) {
-               $self->{num_highwater} = $num;
+               $high = $num;
                $self->meta_accessor('num_highwater', $num);
        }
-       $self->{num_highwater};
+       $high
 }
 
 sub mid_insert {