scripts/import_slrnspool: cleanup progress messages

[public-inbox.git] / scripts / import_slrnspool

diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool
index 98850591e0963eb0c24fa5b98290107c4bdc5e2b..1a7d77a4d767d5d69f5e9a1b341dffa2841e7e56 100755 (executable)
--- a/scripts/import_slrnspool
+++ b/scripts/import_slrnspool
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Incremental (or one-shot) importer of a slrnpull news spool
@@ -11,7 +11,7 @@
 use strict;
 use warnings;
 use PublicInbox::Config;
-use Email::MIME;
+use PublicInbox::MIME;
 use PublicInbox::Import;
 use PublicInbox::Git;
 sub usage { "Usage:\n".join('',grep(/\t/, `head -n 10 $0`)) }
@@ -25,7 +25,15 @@ defined $recipient or die usage();
 my $config = PublicInbox::Config->new;
 my $ibx = $config->lookup($recipient);
 my $git = $ibx->git;
-my $im = PublicInbox::Import->new($git, $ibx->{name}, $ibx->{-primary_address});
+my $im;
+if (($ibx->{version} || 1) == 2) {
+       require PublicInbox::V2Writable;
+       $im = PublicInbox::V2Writable->new($ibx);
+       $im->{parallel} = 0; # pointless to be parallel for a single message
+} else {
+       $im = PublicInbox::Import->new($git, $ibx->{name},
+                                       $ibx->{-primary_address});
+}
 
 sub key {
        "publicinbox.$ibx->{name}.importslrnspoolstate";
@@ -51,14 +59,15 @@ my $n = get_min();
 my $ok;
 my $max_gap = 200000;
 my $max = $n + $max_gap;
+$spool =~ s!/+\z!!;
 
 for (; $exit == 0 && $n < $max; $n++) {
        my $fn = "$spool/$n";
-       print STDERR $fn, "\n";
        open(my $fh, '<', $fn) or next;
        $max = $n + $max_gap;
+       print STDERR $fn, "\n";
 
-       my $mime = Email::MIME->new(eval { local $/; <$fh> });
+       my $mime = PublicInbox::MIME->new(eval { local $/; <$fh> });
        my $hdr = $mime->header_obj;
 
        # gmane rewrites Received headers, which increases spamminess