www: make interface more OO

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 1f28df20fbcae79a0461a4003834a1d9671b0500..e87e559428ffc55400b9942d4c1561c7197dd44e 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -22,14 +22,26 @@ use PublicInbox::GitHTTPBackend;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
 our $END_RE = qr!(f/|T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
-our $pi_config;
 
-sub run {
-       my ($cgi, $method) = @_;
+sub new {
+       my ($class, $pi_config) = @_;
        $pi_config ||= PublicInbox::Config->new;
-       my $ctx = { cgi => $cgi, pi_config => $pi_config };
+       bless { pi_config => $pi_config }, $class;
+}
+
+# backwards compatibility, do not use
+sub run {
+       my ($req, $method) = @_;
+       PublicInbox::WWW->new->call($req->env);
+}
+
+sub call {
+       my ($self, $env) = @_;
+       my $cgi = Plack::Request->new($env);
+       my $ctx = { cgi => $cgi, pi_config => $self->{pi_config} };
        my $path_info = $cgi->path_info;
 
+       my $method = $cgi->method;
        if ($method eq 'POST' &&
                 $path_info =~ m!$LISTNAME_RE/(git-upload-pack)\z!) {
                my $path = $2;
@@ -107,7 +119,7 @@ sub r { [ $_[0], ['Content-Type' => 'text/plain'], [ join(' ', @_, "\n") ] ] }
 # returns undef if valid, array ref response if invalid
 sub invalid_list {
        my ($ctx, $listname) = @_;
-       my $git_dir = $pi_config->get($listname, "mainrepo");
+       my $git_dir = $ctx->{pi_config}->get($listname, "mainrepo");
        if (defined $git_dir) {
                $ctx->{git_dir} = $git_dir;
                $ctx->{git} = PublicInbox::Git->new($git_dir);
@@ -223,12 +235,6 @@ sub get_thread {
        PublicInbox::View::thread_html($ctx, $foot, $srch);
 }
 
-sub self_url {
-       my ($cgi) = @_;
-                                               # Plack::Request
-       ref($cgi) eq 'CGI' ? $cgi->self_url : $cgi->uri->as_string;
-}
-
 sub ctx_get {
        my ($ctx, $key) = @_;
        my $val = $ctx->{$key};
@@ -258,9 +264,7 @@ sub footer {
        my $urls = try_cat("$git_dir/cloneurl");
        my @urls = split(/\r?\n/, $urls || '');
        my %seen = map { $_ => 1 } @urls;
-       my $cgi = $ctx->{cgi};
-       my $http = (ref($cgi) eq 'CGI') ? $cgi->url(-base) . "/$listname" :
-                       $cgi->base->as_string . $listname;
+       my $http = $ctx->{cgi}->base->as_string . $listname;
        $seen{$http} or unshift @urls, $http;
        if (scalar(@urls) == 1) {
                $urls = "URL for <a\nhref=\"" . SSOMA_URL .
@@ -272,7 +276,7 @@ sub footer {
                        join("\n", map { "\t$_" } @urls);
        }
 
-       my $addr = $pi_config->get($listname, 'address');
+       my $addr = $ctx->{pi_config}->get($listname, 'address');
        if (ref($addr) eq 'ARRAY') {
                $addr = $addr->[0]; # first address is primary
        }
@@ -325,7 +329,7 @@ sub get_thread_mbox {
 sub get_thread_atom {
        my ($ctx) = @_;
        searcher($ctx) or return need_search($ctx);
-       $ctx->{self_url} = self_url($ctx->{cgi});
+       $ctx->{self_url} = $ctx->{cgi}->uri->as_string;
        require PublicInbox::Feed;
        PublicInbox::Feed::generate_thread_atom($ctx);
 }
@@ -390,16 +394,8 @@ sub r301 {
        my ($ctx, $listname, $mid, $suffix) = @_;
        my $cgi = $ctx->{cgi};
        my $url;
-       my $qs;
-       if (ref($cgi) eq 'CGI') {
-               $url = $cgi->url(-base) . '/';
-               $qs = $cgi->query_string;
-       } else { # Plack::Request
-               $url = $cgi->base->as_string;
-               $qs = $cgi->env->{QUERY_STRING};
-       }
-
-       $url .= $listname . '/';
+       my $qs = $cgi->env->{QUERY_STRING};
+       $url = $cgi->base->as_string . $listname . '/';
        $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
        $url .= "?$qs" if $qs ne '';