rename 'GitCatFile' package to 'Git'

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 5584e49bf6a993e101a941111a5fbf147397121f..ee414e85d1d5a9442d6a34281df43834e0753cea 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -1,6 +1,8 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 #
+# Main web interface for mailing list archives
+#
 # We focus on the lowest common denominators here:
 # - targeted at text-only console browsers (w3m, links, etc..)
 # - Only basic HTML, CSS only for line-wrapping <pre> text content for GUIs
@@ -11,10 +13,11 @@ package PublicInbox::WWW;
 use 5.008;
 use strict;
 use warnings;
-use PublicInbox::Config;
+use PublicInbox::Config qw(try_cat);
 use URI::Escape qw(uri_escape_utf8 uri_unescape);
 use constant SSOMA_URL => 'http://ssoma.public-inbox.org/';
 use constant PI_URL => 'http://public-inbox.org/';
+require PublicInbox::Git;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
 our $END_RE = qr!(f/|T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
@@ -60,13 +63,13 @@ sub preload {
        require PublicInbox::Feed;
        require PublicInbox::View;
        require PublicInbox::Thread;
-       require PublicInbox::GitCatFile;
        require Email::MIME;
        require Digest::SHA;
        require POSIX;
 
        eval {
                require PublicInbox::Search;
+               require PublicInbox::SearchView;
                require PublicInbox::Mbox;
                require IO::Compress::Gzip;
        };
@@ -78,6 +81,7 @@ sub r404 {
        my ($ctx) = @_;
        if ($ctx && $ctx->{mid}) {
                require PublicInbox::ExtMsg;
+               searcher($ctx);
                return PublicInbox::ExtMsg::ext_msg($ctx);
        }
        r(404, 'Not Found');
@@ -92,6 +96,7 @@ sub invalid_list {
        my $git_dir = $pi_config->get($listname, "mainrepo");
        if (defined $git_dir) {
                $ctx->{git_dir} = $git_dir;
+               $ctx->{git} = PublicInbox::Git->new($git_dir);
                $ctx->{listname} = $listname;
                return;
        }
@@ -129,7 +134,12 @@ sub get_index {
        require PublicInbox::Feed;
        my $srch = searcher($ctx);
        footer($ctx);
-       PublicInbox::Feed::generate_html_index($ctx);
+       if (defined $ctx->{cgi}->param('q')) {
+               require PublicInbox::SearchView;
+               PublicInbox::SearchView::sres_top_html($ctx);
+       } else {
+               PublicInbox::Feed::generate_html_index($ctx);
+       }
 }
 
 # just returns a string ref for the blob in the current ctx
@@ -137,18 +147,7 @@ sub mid2blob {
        my ($ctx) = @_;
        require PublicInbox::MID;
        my $path = PublicInbox::MID::mid2path($ctx->{mid});
-       my @cmd = ('git', "--git-dir=$ctx->{git_dir}",
-                       qw(cat-file blob), "HEAD:$path");
-       my $pid = open my $fh, '-|';
-       defined $pid or die "fork failed: $!\n";
-       if ($pid == 0) {
-               open STDERR, '>', '/dev/null'; # ignore errors
-               exec @cmd or die "exec failed: $!\n";
-       } else {
-               my $blob = eval { local $/; <$fh> };
-               close $fh;
-               $? == 0 ? \$blob : undef;
-       }
+       $ctx->{git}->cat_file("HEAD:$path");
 }
 
 # /$LISTNAME/$MESSAGE_ID/raw                    -> raw mbox
@@ -156,7 +155,7 @@ sub get_mid_txt {
        my ($ctx) = @_;
        my $x = mid2blob($ctx) or return r404($ctx);
        require PublicInbox::Mbox;
-       PublicInbox::Mbox::emit1($x);
+       PublicInbox::Mbox::emit1($ctx, $x);
 }
 
 # /$LISTNAME/$MESSAGE_ID/                   -> HTML content (short quotes)
@@ -209,17 +208,6 @@ sub ctx_get {
        $val;
 }
 
-sub try_cat {
-       my ($path) = @_;
-       my $rv;
-       if (open(my $fh, '<', $path)) {
-               local $/;
-               $rv = <$fh>;
-               close $fh;
-       }
-       $rv;
-}
-
 sub footer {
        my ($ctx) = @_;
        return '' unless $ctx;