From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH] scripts/import_*: remove PublicInbox::MIME usage
Date: Tue, 19 May 2020 09:06:58 +0000 [thread overview]
Message-ID: <20200519090658.31271-1-e@yhbt.net> (raw)
These aren't really supported and will probably be replaced with
better tools, but PublicInbox::Eml should be readily available
to anybody who already has our source tree.
---
scripts/import_maildir | 7 +++----
scripts/import_slrnspool | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/scripts/import_maildir b/scripts/import_maildir
index f4e82543..269f2550 100755
--- a/scripts/import_maildir
+++ b/scripts/import_maildir
@@ -11,9 +11,8 @@
=cut
use strict;
use warnings;
-use Email::Simple;
use Date::Parse qw/str2time/;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Git;
use PublicInbox::Import;
sub usage { "Usage:\n".join('', grep(/\t/, `head -n 24 $0`)) }
@@ -28,7 +27,7 @@ my @msgs;
foreach my $sub (qw(cur new)) {
foreach my $fn (glob("$dir/$sub/*")) {
open my $fh, '<', $fn or next;
- my $s = Email::Simple->new(do { local $/; <$fh> });
+ my $s = PublicInbox::Eml->new(do { local $/; <$fh> });
my $date = $s->header('Date');
my $t = eval { str2time($date) };
defined $t or next;
@@ -45,7 +44,7 @@ my $im = PublicInbox::Import->new($git, $name, $email);
while (my $ary = pop @msgs) {
my $fn = "$dir/$ary->[1]";
open my $fh, '<', $fn or next;
- my $mime = PublicInbox::MIME->new(do { local $/; <$fh> });
+ my $mime = PublicInbox::Eml->new(do { local $/; <$fh> });
$im->add($mime);
}
$im->done;
diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool
index 480e7b4f..bdcc605c 100755
--- a/scripts/import_slrnspool
+++ b/scripts/import_slrnspool
@@ -11,7 +11,7 @@
use strict;
use warnings;
use PublicInbox::Config;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
use PublicInbox::Import;
use PublicInbox::Git;
sub usage { "Usage:\n".join('',grep(/\t/, `head -n 10 $0`)) }
@@ -70,7 +70,7 @@ for (; $exit == 0 && $n < $max; $n++) {
$max = $n + $max_gap;
print STDERR $fn, "\n";
- my $mime = PublicInbox::MIME->new(do { local $/; <$fh> });
+ my $mime = PublicInbox::Eml->new(do { local $/; <$fh> });
$filter->scrub($mime);
$im->add($mime);
reply other threads:[~2020-05-19 9:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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: http://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=20200519090658.31271-1-e@yhbt.net \
--to=e@yhbt.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).