-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Represents a public-inbox (which may have multiple mailing addresses)
package PublicInbox::Inbox;
use strict;
use warnings;
-use Scalar::Util qw(weaken isweak);
use PublicInbox::Git;
use PublicInbox::MID qw(mid2path);
+use Devel::Peek qw(SvREFCNT);
-my $weakt;
+my $cleanup_timer;
eval {
- $weakt = 'disabled';
+ $cleanup_timer = 'disabled';
require PublicInbox::EvCleanup;
- $weakt = undef; # OK if we get here
+ $cleanup_timer = undef; # OK if we get here
};
-my $WEAKEN = {}; # string(inbox) -> inbox
-sub weaken_task () {
- $weakt = undef;
- _weaken_fields($_) for values %$WEAKEN;
- $WEAKEN = {};
+my $CLEANUP = {}; # string(inbox) -> inbox
+sub cleanup_task () {
+ $cleanup_timer = undef;
+ for my $ibx (values %$CLEANUP) {
+ foreach my $f (qw(git mm search)) {
+ delete $ibx->{$f} if SvREFCNT($ibx->{$f}) == 1;
+ }
+ }
+ $CLEANUP = {};
}
-sub _weaken_later ($) {
+sub _cleanup_later ($) {
my ($self) = @_;
- $weakt ||= PublicInbox::EvCleanup::later(*weaken_task);
- $WEAKEN->{"$self"} = $self;
+ $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
+ $CLEANUP->{"$self"} = $self;
}
-sub new {
- my ($class, $opts) = @_;
- my $v = $opts->{address} ||= 'public-inbox@example.com';
- my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
- $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
- weaken($opts->{-pi_config});
- bless $opts, $class;
-}
-
-sub _weaken_fields {
- my ($self) = @_;
- foreach my $f (qw(git mm search)) {
- isweak($self->{$f}) or weaken($self->{$f});
+sub _set_uint ($$$) {
+ my ($opts, $field, $default) = @_;
+ my $val = $opts->{$field};
+ if (defined $val) {
+ $val = $val->[-1] if ref($val) eq 'ARRAY';
+ $val = undef if $val !~ /\A\d+\z/;
}
+ $opts->{$field} = $val || $default;
}
sub _set_limiter ($$$) {
- my ($self, $git, $pfx) = @_;
+ my ($self, $pi_config, $pfx) = @_;
my $lkey = "-${pfx}_limiter";
- $git->{$lkey} = $self->{$lkey} ||= eval {
+ $self->{$lkey} ||= eval {
+ # full key is: publicinbox.$NAME.httpbackendmax
my $mkey = $pfx.'max';
my $val = $self->{$mkey} or return;
my $lim;
require PublicInbox::Qspawn;
$lim = PublicInbox::Qspawn::Limiter->new($val);
} elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
- $lim = $self->{-pi_config}->limiter($val);
+ $lim = $pi_config->limiter($val);
warn "$mkey limiter=$val not found\n" if !$lim;
} else {
warn "$mkey limiter=$val not understood\n";
}
}
+sub new {
+ my ($class, $opts) = @_;
+ my $v = $opts->{address} ||= 'public-inbox@example.com';
+ my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+ $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
+ my $pi_config = delete $opts->{-pi_config};
+ _set_limiter($opts, $pi_config, 'httpbackend');
+ _set_uint($opts, 'feedmax', 25);
+ $opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+ my $dir = $opts->{mainrepo};
+ if (defined $dir && -f "$dir/msgmap.sqlite3") { # XXX DIRTY
+ $opts->{version} = 2;
+ }
+ bless $opts, $class;
+}
+
sub git {
my ($self) = @_;
$self->{git} ||= eval {
- _weaken_later($self);
- my $g = PublicInbox::Git->new($self->{mainrepo});
- _set_limiter($self, $g, 'httpbackend');
+ my $git_dir = $self->{mainrepo};
+ $git_dir .= '/all.git' if (($self->{version} || 1) == 2);
+ my $g = PublicInbox::Git->new($git_dir);
+ $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
+ _cleanup_later($self);
$g;
};
}
sub mm {
my ($self) = @_;
$self->{mm} ||= eval {
- _weaken_later($self);
- PublicInbox::Msgmap->new($self->{mainrepo});
+ _cleanup_later($self);
+ my $dir = $self->{mainrepo};
+ if (($self->{version} || 1) >= 2) {
+ PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
+ } else {
+ PublicInbox::Msgmap->new($dir);
+ }
};
}
sub search {
my ($self) = @_;
$self->{search} ||= eval {
- _weaken_later($self);
- PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
+ _cleanup_later($self);
+ PublicInbox::Search->new($self, $self->{altid});
};
}
$self->{-nntp_url} ||= do {
# no checking for nntp_usable here, we can point entirely
# to non-local servers or users run by a different user
- my $ns = $self->{-pi_config}->{'publicinbox.nntpserver'};
+ my $ns = $self->{nntpserver};
my $group = $self->{newsgroup};
my @urls;
if ($ns && $group) {
# backwards compat to fallback to msg_by_mid
# TODO: remove if we bump SCHEMA_VERSION in Search.pm:
- defined(my $blob = $smsg->blob) or return msg_by_mid($self, $smsg->mid);
+ defined(my $blob = $smsg->{blob}) or
+ return msg_by_path($self, mid2path($smsg->mid), $ref);
my $str = git($self)->cat_file($blob, $ref);
$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
sub msg_by_mid ($$;$) {
my ($self, $mid, $ref) = @_;
- msg_by_path($self, mid2path($mid), $ref);
+ my $srch = search($self) or
+ return msg_by_path($self, mid2path($mid), $ref);
+ my $smsg = $srch->lookup_skeleton($mid) or return;
+ $smsg->load_expand;
+ msg_by_smsg($self, $smsg, $ref);
}
1;