www: _/text/config/raw Last-Modified: is mm->created_at

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

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index de9fd989d1f46e12ae89d33abcb22a06bddf0206..e71f16f80ebd423343e467e2abeebe01d47e58fb 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;
        }
@@ -257,21 +262,10 @@ sub skip_artnum {
 
 sub check_inodes {
        my ($self) = @_;
-       # no filename if in-:memory:
-       my $f = $self->{dbh}->sqlite_db_filename // return;
-       if (my @st = stat($f)) { # did st_dev, st_ino change?
-               my $st = pack('dd', $st[0], $st[1]);
-               if ($st ne ($self->{st} // $st)) {
-                       my $tmp = eval { ref($self)->new_file($f) };
-                       if ($@) {
-                               warn "E: DBI->connect($f): $@\n";
-                       } else {
-                               %$self = %$tmp;
-                       }
-               }
-       } else {
-               warn "W: stat $f: $!\n";
-       }
+       $self->{dbh} // return;
+       my $rw = !$self->{dbh}->{ReadOnly};
+       PublicInbox::Over::check_inodes($self);
+       $self->{dbh} //= PublicInbox::Over::dbh_new($self, !$rw);
 }
 
 1;