inbox: keep Danga::Socket optional

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 47b863094bae63964ff97afc84657473e5c8c75f..73f5761a875b1d1e6b8f6bfa3512248f6db54b5f 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -9,6 +9,7 @@ use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 use Devel::Peek qw(SvREFCNT);
 use PublicInbox::MIME;
+use POSIX qw(strftime);
 
 my $cleanup_timer;
 eval {
@@ -16,6 +17,7 @@ eval {
        require PublicInbox::EvCleanup;
        $cleanup_timer = undef; # OK if we get here
 };
+my $cleanup_broken = $@;
 
 my $CLEANUP = {}; # string(inbox) -> inbox
 sub cleanup_task () {
@@ -30,6 +32,7 @@ sub cleanup_task () {
 
 sub _cleanup_later ($) {
        my ($self) = @_;
+       return if $cleanup_broken;
        return unless PublicInbox::EvCleanup::enabled();
        $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
        $CLEANUP->{"$self"} = $self;
@@ -132,6 +135,7 @@ sub max_git_part {
 sub mm {
        my ($self) = @_;
        $self->{mm} ||= eval {
+               require PublicInbox::Msgmap;
                _cleanup_later($self);
                my $dir = $self->{mainrepo};
                if (($self->{version} || 1) >= 2) {
@@ -271,7 +275,7 @@ sub msg_by_smsg ($$;$) {
        my ($self, $smsg, $ref) = @_;
 
        # ghosts may have undef smsg (from SearchThread.node) or
-       # no {blob} field (from each_smsg_by_mid)
+       # no {blob} field
        return unless defined $smsg;
        defined(my $blob = $smsg->{blob}) or return;
 
@@ -288,20 +292,31 @@ sub smsg_mime {
        }
 }
 
-sub path_check {
-       my ($self, $path) = @_;
-       git($self)->check('HEAD:'.$path);
+sub mid2num($$) {
+       my ($self, $mid) = @_;
+       my $mm = mm($self) or return;
+       $mm->num_for($mid);
+}
+
+sub smsg_by_mid ($$) {
+       my ($self, $mid) = @_;
+       my $srch = search($self) or return;
+       # favor the Message-ID we used for the NNTP article number:
+       my $num = mid2num($self, $mid);
+       defined $num ? $srch->lookup_article($num) : undef;
 }
 
 sub msg_by_mid ($$;$) {
        my ($self, $mid, $ref) = @_;
        my $srch = search($self) or
-                       return msg_by_path($self, mid2path($mid), $ref);
-       my $smsg;
-       $srch->retry_reopen(sub {
-               $smsg = $srch->lookup_skeleton($mid) and $smsg->load_expand;
-       });
+               return msg_by_path($self, mid2path($mid), $ref);
+       my $smsg = smsg_by_mid($self, $mid);
        $smsg ? msg_by_smsg($self, $smsg, $ref) : undef;
 }
 
+sub recent {
+       my ($self, $opts, $after, $before) = @_;
+       search($self)->{over_ro}->recent($opts, $after, $before);
+}
+
 1;