www_coderepo: an alternative to cgit

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 37342d7d10a473c77498596a2c7a8c8aa3f573e0..395add1fecee08305e6748b989a341b89b0b526d 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: GPLv2 or later <https://www.gnu.org/licenses/gpl-2.0.txt>
 #
 # Used to read files from a git repository without excessive forking.
@@ -66,12 +66,12 @@ sub new {
        $git_dir =~ tr!/!/!s;
        $git_dir =~ s!/*\z!!s;
        # may contain {-tmp} field for File::Temp::Dir
-       bless { git_dir => $git_dir, alt_st => '', -git_path => {} }, $class
+       bless { git_dir => $git_dir }, $class
 }
 
 sub git_path ($$) {
        my ($self, $path) = @_;
-       $self->{-git_path}->{$path} ||= do {
+       $self->{-git_path}->{$path} //= do {
                local $/ = "\n";
                chomp(my $str = $self->qx(qw(rev-parse --git-path), $path));
 
@@ -90,10 +90,17 @@ sub alternates_changed {
 
        # can't rely on 'q' on some 32-bit builds, but `d' works
        my $st = pack('dd', $st[10], $st[7]); # 10: ctime, 7: size
-       return 0 if $self->{alt_st} eq $st;
+       return 0 if ($self->{alt_st} // '') eq $st;
        $self->{alt_st} = $st; # always a true value
 }
 
+sub object_format {
+       $_[0]->{object_format} //= do {
+               my $fmt = $_[0]->qx(qw(config extensions.objectformat));
+               $fmt eq "sha256\n" ? \'sha256' : \undef;
+       }
+}
+
 sub last_check_err {
        my ($self) = @_;
        my $fh = $self->{err_c} or return;
@@ -114,7 +121,7 @@ sub _bidi_pipe {
                return;
        }
        pipe(my ($out_r, $out_w)) or $self->fail("pipe failed: $!");
-       my $rdr = { 0 => $out_r };
+       my $rdr = { 0 => $out_r, pgid => 0 };
        my $gd = $self->{git_dir};
        if ($gd =~ s!/([^/]+/[^/]+)\z!/!) {
                $rdr->{-C} = $gd;
@@ -158,7 +165,8 @@ sub my_read ($$$) {
                        return; # unrecoverable error
                }
        }
-       \substr($$rbuf, 0, $len, '');
+       my $no_pad = substr($$rbuf, 0, $len, '');
+       \$no_pad;
 }
 
 sub my_readline ($$) {
@@ -341,7 +349,7 @@ sub async_abort ($) {
        while (scalar(@{$self->{inflight_c} // []}) ||
                        scalar(@{$self->{inflight} // []})) {
                for my $c ('', '_c') {
-                       my $q = $self->{"inflight$c"};
+                       my $q = $self->{"inflight$c"} or next;
                        while (@$q) {
                                my ($req, $cb, $arg) = splice(@$q, 0, 3);
                                $req = $$req if ref($req);
@@ -442,13 +450,8 @@ sub packed_bytes {
 sub DESTROY { cleanup(@_) }
 
 sub local_nick ($) {
-       my ($self) = @_;
-       my $ret = '???';
        # don't show full FS path, basename should be OK:
-       if ($self->{git_dir} =~ m!/([^/]+)(?:/*\.git/*)?\z!) {
-               $ret = "$1.git";
-       }
-       wantarray ? ($ret) : $ret;
+       $_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? "$1.git" : '???';
 }
 
 sub host_prefix_url ($$) {
@@ -460,12 +463,22 @@ sub host_prefix_url ($$) {
        "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/') . $url;
 }
 
+sub base_url { # for coderepos, PSGI-only
+       my ($self, $env) = @_; # env - PSGI env
+       my $url = host_prefix_url($env, '');
+       # for mount in Plack::Builder
+       $url .= '/' if substr($url, -1, 1) ne '/';
+       $url . $self->{nick} . '/';
+}
+
+sub isrch {} # TODO
+
 sub pub_urls {
        my ($self, $env) = @_;
        if (my $urls = $self->{cgit_url}) {
                return map { host_prefix_url($env, $_) } @$urls;
        }
-       local_nick($self);
+       (local_nick($self));
 }
 
 sub cat_async_begin {
@@ -495,6 +508,33 @@ sub modified ($) {
        (split(/ /, <$fh> // time))[0] + 0; # integerize for JSON
 }
 
+sub try_cat {
+       my ($path) = @_;
+       open(my $fh, '<', $path) or return '';
+       local $/;
+       <$fh> // '';
+}
+
+sub cat_desc ($) {
+       my $desc = try_cat($_[0]);
+       chomp $desc;
+       utf8::decode($desc);
+       $desc =~ s/\s+/ /smg;
+       $desc eq '' ? undef : $desc;
+}
+
+sub description {
+       cat_desc("$_[0]->{git_dir}/description") // 'Unnamed repository';
+}
+
+sub cloneurl {
+       my ($self, $env) = @_;
+       $self->{cloneurl} // do {
+               my @urls = split(/\s+/s, try_cat("$self->{git_dir}/cloneurl"));
+               scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef;
+       } // [ substr(base_url($self, $env), 0, -1) ];
+}
+
 # for grokmirror, which doesn't read gitweb.description
 # templates/hooks--update.sample and git-multimail in git.git
 # only match "Unnamed repository", not the full contents of
@@ -517,14 +557,8 @@ sub manifest_entry {
        chomp(my $owner = $self->qx('config', 'gitweb.owner'));
        utf8::decode($owner);
        $ent->{owner} = $owner eq '' ? undef : $owner;
-       my $desc = '';
-       if (open($fh, '<', "$git_dir/description")) {
-               local $/ = "\n";
-               chomp($desc = <$fh>);
-               utf8::decode($desc);
-       }
-       $desc = 'Unnamed repository' if $desc eq '';
-       if (defined $epoch && $desc =~ /\AUnnamed repository/) {
+       my $desc = description($self);
+       if (defined $epoch && index($desc, 'Unnamed repository') == 0) {
                $desc = "$default_desc [epoch $epoch]";
        }
        $ent->{description} = $desc;