X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=4f27d1bbb65f9aa5dee21b66aa5eb8202004f796;hb=87678710135973f72722258e171fc00f85c86ec8;hp=c0eb640f14f2630eb314e148bb33cc4ca47f53f0;hpb=d304870c3c1e82f0421272e7986fc5c9aafa2889;p=public-inbox.git
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index c0eb640f..4f27d1bb 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
#
# Represents a public-inbox (which may have multiple mailing addresses)
@@ -50,9 +50,9 @@ sub cleanup_task () {
}
sub cleanup_possible () {
- # no need to require EvCleanup, here, if it were enabled another
+ # no need to require DS, here, if it were enabled another
# module would've require'd it, already
- eval { PublicInbox::EvCleanup::enabled() } or return 0;
+ eval { PublicInbox::DS::in_loop() } or return 0;
eval {
require Devel::Peek; # needs separate package in Fedora
@@ -65,7 +65,7 @@ sub _cleanup_later ($) {
my ($self) = @_;
$cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
return if $cleanup_avail != 1;
- $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
+ $cleanup_timer ||= PublicInbox::DS::later(*cleanup_task);
$CLEANUP->{"$self"} = $self;
}
@@ -109,7 +109,7 @@ sub new {
_set_limiter($opts, $pi_config, 'httpbackend');
_set_uint($opts, 'feedmax', 25);
$opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
- my $dir = $opts->{mainrepo};
+ my $dir = $opts->{inboxdir};
if (defined $dir && -f "$dir/inbox.lock") {
$opts->{version} = 2;
}
@@ -125,11 +125,13 @@ 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->{mainrepo}/git/$epoch.git";
+ my $git_dir = "$self->{inboxdir}/git/$epoch.git";
my $g = PublicInbox::Git->new($git_dir);
$g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
# no cleanup needed, we never cat-file off this, only clone
@@ -140,8 +142,8 @@ sub git_epoch {
sub git {
my ($self) = @_;
$self->{git} ||= eval {
- my $git_dir = $self->{mainrepo};
- $git_dir .= '/all.git' if (($self->{version} || 1) == 2);
+ my $git_dir = $self->{inboxdir};
+ $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,13 +153,12 @@ 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) {
$self->git->cleanup if $changed;
- my $gits = "$self->{mainrepo}/git";
+ my $gits = "$self->{inboxdir}/git";
if (opendir my $dh, $gits) {
my $max = -1;
while (defined(my $git_dir = readdir($dh))) {
@@ -177,8 +178,8 @@ sub mm {
$self->{mm} ||= eval {
require PublicInbox::Msgmap;
_cleanup_later($self);
- my $dir = $self->{mainrepo};
- if (($self->{version} || 1) >= 2) {
+ my $dir = $self->{inboxdir};
+ if ($self->version >= 2) {
PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
} else {
PublicInbox::Msgmap->new($dir);
@@ -218,48 +219,38 @@ sub try_cat {
sub description {
my ($self) = @_;
- my $desc = $self->{description};
- return $desc if defined $desc;
- $desc = try_cat("$self->{mainrepo}/description");
- local $/ = "\n";
- chomp $desc;
- $desc =~ s/\s+/ /smg;
- $desc = '($INBOX_DIR/description missing)' if $desc eq '';
- $self->{description} = $desc;
+ $self->{description} //= do {
+ my $desc = try_cat("$self->{inboxdir}/description");
+ local $/ = "\n";
+ chomp $desc;
+ $desc =~ s/\s+/ /smg;
+ $desc eq '' ? '($INBOX_DIR/description missing)' : $desc;
+ };
}
sub cloneurl {
my ($self) = @_;
- my $url = $self->{cloneurl};
- return $url if $url;
- $url = try_cat("$self->{mainrepo}/cloneurl");
- my @url = split(/\s+/s, $url);
- local $/ = "\n";
- chomp @url;
- $self->{cloneurl} = \@url;
+ $self->{cloneurl} //=
+ [ split(/\s+/s, try_cat("$self->{inboxdir}/cloneurl")) ];
}
sub base_url {
- my ($self, $env) = @_;
- my $scheme;
- if ($env && ($scheme = $env->{'psgi.url_scheme'})) { # PSGI env
- my $host_port = $env->{HTTP_HOST} ||
- "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
- my $url = "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/');
+ my ($self, $env) = @_; # env - PSGI env
+ if ($env) {
+ my $url = PublicInbox::Git::host_prefix_url($env, '');
# for mount in Plack::Builder
$url .= '/' if $url !~ m!/\z!;
- $url .= $self->{name} . '/';
- } else {
- # either called from a non-PSGI environment (e.g. NNTP/POP3)
- $self->{-base_url} ||= do {
- my $url = $self->{url} or return undef;
- # expand protocol-relative URLs to HTTPS if we're
- # not inside a web server
- $url = "https:$url" if $url =~ m!\A//!;
- $url .= '/' if $url !~ m!/\z!;
- $url;
- };
+ return $url .= $self->{name} . '/';
}
+ # called from a non-PSGI environment (e.g. NNTP/POP3):
+ $self->{-base_url} ||= do {
+ my $url = $self->{url}->[0] or return undef;
+ # expand protocol-relative URLs to HTTPS if we're
+ # not inside a web server
+ $url = "https:$url" if $url =~ m!\A//!;
+ $url .= '/' if $url !~ m!/\z!;
+ $url;
+ };
}
sub nntp_url {
@@ -297,12 +288,11 @@ sub nntp_url {
# nntp://news.example.com/alt.example
push @m, $u;
}
- my %seen = map { $_ => 1 } @urls;
- foreach my $u (@m) {
- next if $seen{$u};
- $seen{$u} = 1;
- push @urls, $u;
- }
+
+ # List::Util::uniq requires Perl 5.26+, maybe we
+ # can use it by 2030 or so
+ my %seen;
+ @urls = grep { !$seen{$_}++ } (@urls, @m);
}
\@urls;
};
@@ -315,9 +305,9 @@ sub nntp_usable {
$ret;
}
+# for v1 users w/o SQLite only
sub msg_by_path ($$;$) {
my ($self, $path, $ref) = @_;
- # TODO: allow other refs:
my $str = git($self)->cat_file('HEAD:'.$path, $ref);
$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
$str;
@@ -356,7 +346,7 @@ sub smsg_by_mid ($$) {
# favor the Message-ID we used for the NNTP article number:
defined(my $num = mid2num($self, $mid)) or return;
my $smsg = $over->get_art($num) or return;
- PublicInbox::SearchMsg::psgi_cull($smsg);
+ PublicInbox::Smsg::psgi_cull($smsg);
}
sub msg_by_mid ($$;$) {