X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=scripts%2Fimport_slrnspool;h=d9a35dfdfa86b817018540bf3450ffbbbf289f94;hp=b913cf3212d17de382ce91ba761b0c9025a58529;hb=21fcd8a37c82c1ef654d402cf592f0c9d803aa26;hpb=227a1d886672767e37cc86a3432952c14eb8a143 diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool index b913cf32..d9a35dfd 100755 --- a/scripts/import_slrnspool +++ b/scripts/import_slrnspool @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# Copyright (C) 2015-2019 all contributors +# Copyright (C) 2015-2021 all contributors # License: AGPL-3.0+ # # Incremental (or one-shot) importer of a slrnpull news spool @@ -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`)) } @@ -22,8 +22,8 @@ $SIG{TERM} = $sighandler; my $spool = shift @ARGV or die usage(); my $recipient = $ENV{ORIGINAL_RECIPIENT}; defined $recipient or die usage(); -my $config = PublicInbox::Config->new; -my $ibx = $config->lookup($recipient); +my $cfg = PublicInbox::Config->new; +my $ibx = $cfg->lookup($recipient); my $git = $ibx->git; my $im; if ($ibx->version == 2) { @@ -70,7 +70,7 @@ for (; $exit == 0 && $n < $max; $n++) { $max = $n + $max_gap; print STDERR $fn, "\n"; - my $mime = PublicInbox::MIME->new(eval { local $/; <$fh> }); + my $mime = PublicInbox::Eml->new(do { local $/; <$fh> }); $filter->scrub($mime); $im->add($mime);