X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FMID.pm;h=78952b95e02f1eb94a6876017bc6c8e6a911978c;hb=3cda6050b7c8f73e7fd86f88efc5cd42d0c13f73;hp=d097011bf4ae21b58075def04f2306cd66a22f54;hpb=9041b136ba7a106ed5ff33da4b6ae28c2a0f4333;p=public-inbox.git
diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm
index d097011b..78952b95 100644
--- a/lib/PublicInbox/MID.pm
+++ b/lib/PublicInbox/MID.pm
@@ -1,10 +1,12 @@
-# Copyright (C) 2015, all contributors
+# Copyright (C) 2015 all contributors
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+#
+# Various Message-ID-related functions.
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 id_compress mid2path mid_mime/;
use Digest::SHA qw/sha1_hex/;
use constant MID_MAX => 40; # SHA-1 hex length
@@ -12,16 +14,20 @@ 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 {
- my ($mid) = @_;
- return $mid if (length($mid) <= MID_MAX);
- sha1_hex($mid);
+sub id_compress {
+ my ($id, $force) = @_;
+
+ if ($force || $id =~ /[^\w\-]/ || length($id) > MID_MAX) {
+ return sha1_hex($id);
+ }
+ $id;
}
sub mid2path {
@@ -30,10 +36,12 @@ sub mid2path {
unless (defined $x38) {
# compatibility with old links (or short Message-IDs :)
- $mid = sha1_hex($mid);
+ $mid = sha1_hex(mid_clean($mid));
($x2, $x38) = ($mid =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
}
"$x2/$x38";
}
+sub mid_mime ($) { $_[0]->header_obj->header_raw('Message-ID') }
+
1;