From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 01/11] import: consolidate mid prepend logic, here
Date: Tue, 27 Mar 2018 11:11:22 +0000 [thread overview]
Message-ID: <20180327111132.20681-2-e@80x24.org> (raw)
In-Reply-To: <20180327111132.20681-1-e@80x24.org>
This also quiets down warnings from -watch when spam training
happens on messages without Message-Id.
---
lib/PublicInbox/Import.pm | 31 ++++++++++++++++++++++++-------
lib/PublicInbox/V2Writable.pm | 3 +--
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 5d116a1..6824fac 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -203,7 +203,7 @@ sub remove {
my ($r, $w) = $self->gfi_start;
my $tip = $self->{tip};
if ($path_type eq '2/38') {
- $path = mid2path(mid_mime($mime));
+ $path = mid2path(v1_mid0($mime));
($err, $cur) = check_remove_v1($r, $w, $tip, $path, $mime);
return ($err, $cur) if $err;
} else {
@@ -296,6 +296,28 @@ sub drop_unwanted_headers ($) {
$mime->header_set($_) for @PublicInbox::MDA::BAD_HEADERS;
}
+# used by V2Writable, too
+sub prepend_mid ($$) {
+ my ($hdr, $mid0) = @_;
+ # @cur is likely empty if we need to call this sub, but it could
+ # have random unparseable crap which we'll preserve, too.
+ my @cur = $hdr->header_raw('Message-Id');
+ $hdr->header_set('Message-Id', "<$mid0>", @cur);
+}
+
+sub v1_mid0 ($) {
+ my ($mime) = @_;
+ my $hdr = $mime->header_obj;
+ my $mids = mids($hdr);
+
+ if (!scalar(@$mids)) { # spam often has no Message-Id
+ my $mid0 = digest2mid(content_digest($mime));
+ prepend_mid($hdr, $mid0);
+ return $mid0;
+ }
+ $mids->[0];
+}
+
# returns undef on duplicate
# returns the :MARK of the most recent commit
sub add {
@@ -313,12 +335,7 @@ sub add {
my $path;
if ($path_type eq '2/38') {
- my $mids = mids($mime->header_obj);
- if (!scalar(@$mids)) {
- my $dig = content_digest($mime);
- @$mids = (digest2mid($dig));
- }
- $path = mid2path($mids->[0]);
+ $path = mid2path(v1_mid0($mime));
} else { # v2 layout, one file:
$path = 'm';
}
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 20c2736..b04e6fb 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -173,8 +173,7 @@ sub num_for_harder {
$num = $self->{skel}->{mm}->mid_insert($$mid0);
}
}
- my @cur = $hdr->header_raw('Message-Id');
- $hdr->header_set('Message-Id', "<$$mid0>", @cur);
+ PublicInbox::Import::prepend_mid($hdr, $$mid0);
$num;
}
--
EW
next prev parent reply other threads:[~2018-03-27 11:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-27 11:11 [PATCH 00/11] duplicate support in UI + tests Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` Eric Wong (Contractor, The Linux Foundation) [this message]
2018-03-27 11:11 ` [PATCH 02/11] www: $MESSAGE_ID/raw endpoint supports "duplicates" Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 03/11] search: reopen DB if each_smsg_by_mid fails Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 04/11] t/psgi_v2: minimal test for Atom feed and t.mbox.gz Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 05/11] feed: fix new.html for v2 Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 06/11] view: permalink (per-message) view shows multiple messages Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 07/11] searchidx: warn about vivifying multiple ghosts Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 08/11] v2writable: warn on unseen deleted files Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 09/11] www: get rid of unnecessary 'inbox' name reference Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 10/11] searchview: remove unnecessary imports from MID module Eric Wong (Contractor, The Linux Foundation)
2018-03-27 11:11 ` [PATCH 11/11] view: depend on SearchMsg for Message-ID Eric Wong (Contractor, The Linux Foundation)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180327111132.20681-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).