remove hard Devel::Peek dependency and lazy load for daemons

[public-inbox.git] / scripts / import_slrnspool

diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool
index ab79e7982da8c1cbfc45d8f59e02125b10160e8b..e7ea45c1242a7f616201f4fe7718543e7730ec1b 100755 (executable)
--- a/scripts/import_slrnspool
+++ b/scripts/import_slrnspool
@@ -35,6 +35,9 @@ if (($ibx->{version} || 1) == 2) {
                                        $ibx->{-primary_address});
 }
 
+$ibx->{filter} ||= 'PublicInbox::Filter::Gmane';
+my $filter = $ibx->filter;
+
 sub key {
        "publicinbox.$ibx->{name}.importslrnspoolstate";
 }
@@ -59,34 +62,16 @@ 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 = PublicInbox::MIME->new(eval { local $/; <$fh> });
-       my $hdr = $mime->header_obj;
-
-       # gmane rewrites Received headers, which increases spamminess
-       # Some older archives set Original-To
-       foreach my $x (qw(Received To)) {
-               my @h = $hdr->header_raw("Original-$x");
-               if (@h) {
-                       $hdr->header_set($x, @h);
-                       $hdr->header_set("Original-$x");
-               }
-       }
-
-       # Approved triggers for the SA HEADER_SPAM rule,
-       # X-From is gmane specific
-       foreach my $drop (qw(Approved X-From)) {
-               $hdr->header_set($drop);
-       }
-
-       # appears to be an old gmane bug:
-       $hdr->header_set('connect()');
+       $filter->scrub($mime);
        $im->add($mime);
 
        $ok = $n + 1;