X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=414973c6dedd9b6137852695092877cc0b62e7a1;hb=50c1b933afec4937ebc99e1d372cef2dc6b295c2;hp=ada713c741657ef16522d4b118cffebcbd95c4be;hpb=62e690b87d03ab1fa1829f99e37c63707c64a5c4;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index ada713c7..414973c6 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -9,34 +9,86 @@ use Scalar::Util qw(weaken isweak);
 use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 
+my $weakt;
+eval {
+	$weakt = 'disabled';
+	require PublicInbox::EvCleanup;
+	$weakt = undef; # OK if we get here
+};
+
+my $WEAKEN = {}; # string(inbox) -> inbox
+sub weaken_task () {
+	$weakt = undef;
+	_weaken_fields($_) for values %$WEAKEN;
+	$WEAKEN = {};
+}
+
+sub _weaken_later ($) {
+	my ($self) = @_;
+	$weakt ||= PublicInbox::EvCleanup::later(*weaken_task);
+	$WEAKEN->{"$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_all {
+sub _weaken_fields {
 	my ($self) = @_;
 	foreach my $f (qw(git mm search)) {
 		isweak($self->{$f}) or weaken($self->{$f});
 	}
 }
 
+sub _set_limiter ($$$) {
+	my ($self, $git, $pfx) = @_;
+	my $lkey = "-${pfx}_limiter";
+	$git->{$lkey} = $self->{$lkey} ||= eval {
+		my $mkey = $pfx.'max';
+		my $val = $self->{$mkey} or return;
+		my $lim;
+		if ($val =~ /\A\d+\z/) {
+			require PublicInbox::Qspawn;
+			$lim = PublicInbox::Qspawn::Limiter->new($val);
+		} elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
+			$lim = $self->{-pi_config}->limiter($val);
+			warn "$mkey limiter=$val not found\n" if !$lim;
+		} else {
+			warn "$mkey limiter=$val not understood\n";
+		}
+		$lim;
+	}
+}
+
 sub git {
 	my ($self) = @_;
-	$self->{git} ||= eval { PublicInbox::Git->new($self->{mainrepo}) };
+	$self->{git} ||= eval {
+		_weaken_later($self);
+		my $g = PublicInbox::Git->new($self->{mainrepo});
+		_set_limiter($self, $g, 'httpbackend');
+		$g;
+	};
 }
 
 sub mm {
 	my ($self) = @_;
-	$self->{mm} ||= eval { PublicInbox::Msgmap->new($self->{mainrepo}) };
+	$self->{mm} ||= eval {
+		_weaken_later($self);
+		PublicInbox::Msgmap->new($self->{mainrepo});
+	};
 }
 
 sub search {
 	my ($self) = @_;
-	$self->{search} ||= eval { PublicInbox::Search->new($self->{mainrepo}) };
+	$self->{search} ||= eval {
+		_weaken_later($self);
+		PublicInbox::Search->new($self->{mainrepo}, $self->{altid});
+	};
 }
 
 sub try_cat {
@@ -54,6 +106,7 @@ sub description {
 	my $desc = $self->{description};
 	return $desc if defined $desc;
 	$desc = try_cat("$self->{mainrepo}/description");
+	local $/ = "\n";
 	chomp $desc;
 	$desc =~ s/\s+/ /smg;
 	$desc = '($GIT_DIR/description missing)' if $desc eq '';
@@ -66,15 +119,20 @@ sub cloneurl {
 	return $url if $url;
 	$url = try_cat("$self->{mainrepo}/cloneurl");
 	my @url = split(/\s+/s, $url);
+	local $/ = "\n";
 	chomp @url;
 	$self->{cloneurl} = \@url;
 }
 
 sub base_url {
-	my ($self, $prq) = @_; # Plack::Request
-	if (defined $prq) {
-		my $url = $prq->base->as_string;
-		$url .= '/' if $url !~ m!/\z!; # for mount in Plack::Builder
+	my ($self, $env) = @_;
+	if ($env) { # PSGI env
+		my $scheme = $env->{'psgi.url_scheme'};
+		my $host_port = $env->{HTTP_HOST} ||
+			"$env->{SERVER_NAME}:$env->{SERVER_PORT}";
+		my $url = "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/');
+		# 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)
@@ -89,6 +147,52 @@ sub base_url {
 	}
 }
 
+sub nntp_url {
+	my ($self) = @_;
+	$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 $group = $self->{newsgroup};
+		my @urls;
+		if ($ns && $group) {
+			$ns = [ $ns ] if ref($ns) ne 'ARRAY';
+			@urls = map {
+				my $u = m!\Anntps?://! ? $_ : "nntp://$_";
+				$u .= '/' if $u !~ m!/\z!;
+				$u.$group;
+			} @$ns;
+		}
+
+		my $mirrors = $self->{nntpmirror};
+		if ($mirrors) {
+			my @m;
+			foreach (@$mirrors) {
+				my $u = m!\Anntps?://! ? $_ : "nntp://$_";
+				if ($u =~ m!\Anntps?://[^/]+/?\z!) {
+					if ($group) {
+						$u .= '/' if $u !~ m!/\z!;
+						$u .= $group;
+					} else {
+						warn
+"publicinbox.$self->{name}.nntpmirror=$_ missing newsgroup name\n";
+					}
+				}
+				# else: allow full URLs like:
+				# 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;
+			}
+		}
+		\@urls;
+	};
+}
+
 sub nntp_usable {
 	my ($self) = @_;
 	my $ret = $self->mm && $self->search;
@@ -104,6 +208,23 @@ sub msg_by_path ($$;$) {
 	$str;
 }
 
+sub msg_by_smsg ($$;$) {
+	my ($self, $smsg, $ref) = @_;
+
+	# 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);
+
+	my $str = git($self)->cat_file($blob, $ref);
+	$$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
+	$str;
+}
+
+sub path_check {
+	my ($self, $path) = @_;
+	git($self)->check('HEAD:'.$path);
+}
+
 sub msg_by_mid ($$;$) {
 	my ($self, $mid, $ref) = @_;
 	msg_by_path($self, mid2path($mid), $ref);