inbox: use PublicInbox::Git::host_prefix_url for base_url

Better not to duplicate the same logic across different classes.

Also, our git wrapper class is a strange place for
host_prefix_url, but it needs to be usable for coderepos, so
it's there, for now...

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index a3cdcbc08f6c7f6626b40a2cebbbb73b6be14e0d..ff80096528eb2301aae63c9389dba01421051868 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -240,26 +240,22 @@ sub 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}->[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;
-               };
+               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 {

diff --git a/t/solver_git.t b/t/solver_git.t
index 55746994d9f94cc887d2b5c71f46315f73cb9445..7c5619a7a15d31ebcc95a6ceb005e902bbe2b24f 100644 (file)
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -48,7 +48,7 @@ $ibx->{-repo_objs} = [ $git ];
 my $res;
 my $solver = PublicInbox::SolverGit->new($ibx, sub { $res = $_[0] });
 open my $log, '+>>', "$inboxdir/solve.log" or die "open: $!";
-my $psgi_env = { 'psgi.errors' => *STDERR };
+my $psgi_env = { 'psgi.errors' => *STDERR, 'psgi.url_scheme' => 'http' };
 $solver->solve($psgi_env, $log, '69df7d5', {});
 ok($res, 'solved a blob!');
 my $wt_git = $res->[0];