wwwstream: allow undef noop callback

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 3f1b7334f01109343a1b1723c165f6d5bbe5b299..728caa0c3f9e059da3a42ecf4019fbb8b66c881c 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -5,7 +5,7 @@
 package PublicInbox::Inbox;
 use strict;
 use warnings;
-use Scalar::Util qw(weaken);
+use Scalar::Util qw(weaken isweak);
 use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 
@@ -19,7 +19,9 @@ sub new {
 
 sub weaken_all {
        my ($self) = @_;
-       weaken($self->{$_}) foreach qw(git mm search);
+       foreach my $f (qw(git mm search)) {
+               isweak($self->{$f}) or weaken($self->{$f});
+       }
 }
 
 sub git {
@@ -69,10 +71,14 @@ sub cloneurl {
 }
 
 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)
@@ -97,7 +103,14 @@ sub nntp_usable {
 sub msg_by_path ($$;$) {
        my ($self, $path, $ref) = @_;
        # TODO: allow other refs:
-       git($self)->cat_file('HEAD:'.$path, $ref);
+       my $str = git($self)->cat_file('HEAD:'.$path, $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 ($$;$) {