git: allow cloning from the URL root, too

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index faab03ce4cb220d491dbf6d501956f49dcfa9289..ada713c741657ef16522d4b118cffebcbd95c4be 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -5,18 +5,23 @@
 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);
 
 sub new {
        my ($class, $opts) = @_;
+       my $v = $opts->{address} ||= 'public-inbox@example.com';
+       my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+       $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
        bless $opts, $class;
 }
 
 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 {
@@ -94,7 +99,9 @@ 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 msg_by_mid ($$;$) {