www_stream: add trailing slash for help and color links

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 8a3a01940a008473bebab3d307608f1d432762f8..da7ea75f1a5741c7702aa0a85466ee908b9f019b 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Represents a public-inbox (which may have multiple mailing addresses)
@@ -109,10 +109,6 @@ sub new {
                delete $opts->{feedmax};
        }
        $opts->{nntpserver} ||= $pi_cfg->{'publicinbox.nntpserver'};
-       my $dir = $opts->{inboxdir};
-       if (defined $dir && -f "$dir/inbox.lock") {
-               $opts->{version} = 2;
-       }
 
        # allow any combination of multi-line or comma-delimited hide entries
        my $hide = {};
@@ -125,7 +121,9 @@ sub new {
        bless $opts, $class;
 }
 
-sub version { $_[0]->{version} // 1 }
+sub version {
+       $_[0]->{version} //= -f "$_[0]->{inboxdir}/inbox.lock" ? 2 : 1
+}
 
 sub git_epoch {
        my ($self, $epoch) = @_; # v2-only, callers always supply $epoch
@@ -134,7 +132,7 @@ sub git_epoch {
                return unless -d $git_dir;
                my $g = PublicInbox::Git->new($git_dir);
                $g->{-httpbackend_limiter} = $self->{-httpbackend_limiter};
-               # no cleanup needed, we never cat-file off this, only clone
+               # caller must manually cleanup when done
                $g;
        };
 }
@@ -198,7 +196,7 @@ sub isrch { $_[0]->{isrch} // search($_[0]) }
 
 sub over {
        $_[0]->{over} //= eval {
-               my $srch = $_[0]->{search} //= eval {
+               my $srch = $_[0]->{search} //= do {
                        _cleanup_later($_[0]);
                        require PublicInbox::Search;
                        PublicInbox::Search->new($_[0]);
@@ -212,12 +210,9 @@ sub over {
 
 sub try_cat {
        my ($path) = @_;
-       my $rv = '';
-       if (open(my $fh, '<', $path)) {
-               local $/;
-               $rv = <$fh>;
-       }
-       $rv;
+       open(my $fh, '<', $path) or return '';
+       local $/;
+       <$fh> // '';
 }
 
 sub cat_desc ($) {
@@ -416,8 +411,8 @@ sub on_unlock {
        my ($self) = @_;
        check_inodes($self);
        my $subs = $self->{unlock_subs} or return;
-       for (values %$subs) {
-               eval { $_->on_inbox_unlock($self) };
+       for my $obj (values %$subs) {
+               eval { $obj->on_inbox_unlock($self) };
                warn "E: $@ ($self->{inboxdir})\n" if $@;
        }
 }
@@ -426,4 +421,16 @@ sub uidvalidity { $_[0]->{uidvalidity} //= eval { $_[0]->mm->created_at } }
 
 sub eidx_key { $_[0]->{newsgroup} // $_[0]->{inboxdir} }
 
+sub mailboxid { # rfc 8474, 8620, 8621
+       my ($self, $imap_slice) = @_;
+       my $pfx = defined($imap_slice) ? $self->{newsgroup} : $self->{name};
+       utf8::encode($pfx); # to octets
+       # RFC 8620, 1.2 recommends not starting with dash or digits
+       # "A good solution to these issues is to prefix every id with a single
+       #  alphabetical character."
+       'M'.join('', map { sprintf('%02x', ord) } split(//, $pfx)) .
+               (defined($imap_slice) ? sprintf('-%x', $imap_slice) : '') .
+               sprintf('-%x', uidvalidity($self) // 0)
+}
+
 1;