mid: extract Message-ID from inside '<>'

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

diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index 2f0c09fb843e770b9307fcca31405ec4fd362275..8ca3c5797e314e6440aaf36ebc1c1fc4b7134e7c 100644 (file)
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -4,7 +4,7 @@ package PublicInbox::MID;
 use strict;
 use warnings;
 use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean mid_compressed mid2path/;
+our @EXPORT_OK = qw/mid_clean mid_compress mid2path/;
 use Digest::SHA qw/sha1_hex/;
 use constant MID_MAX => 40; # SHA-1 hex length
 
@@ -12,13 +12,14 @@ sub mid_clean {
        my ($mid) = @_;
        defined($mid) or die "no Message-ID";
        # MDA->precheck did more checking for us
-       $mid =~ s/\A\s*<?//;
-       $mid =~ s/>?\s*\z//;
+       if ($mid =~ /<([^>]+)>/) {
+               $mid = $1;
+       }
        $mid;
 }
 
 # this is idempotent
-sub mid_compressed {
+sub mid_compress {
        my ($mid, $force) = @_;
 
        # XXX dirty hack! FIXME!