X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=scripts%2Fimport_vger_from_mbox;h=d1ce723162e47686647cd26a690a9df60e4c9933;hb=2fc67a18b7ccd75ea6eb945f18203cbf4bcf228f;hp=44055ffda5c38bc84c43e5df2bdb530814f25eca;hpb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;p=public-inbox.git
diff --git a/scripts/import_vger_from_mbox b/scripts/import_vger_from_mbox
index 44055ffd..d1ce7231 100644
--- a/scripts/import_vger_from_mbox
+++ b/scripts/import_vger_from_mbox
@@ -1,47 +1,44 @@
#!/usr/bin/perl -w
-# Copyright (C) 2016-2018 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
-use Email::MIME;
-$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
-use PublicInbox::Git;
-use PublicInbox::Import;
-my $usage = "usage: $0 NAME EMAIL new($git_dir);
+use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
+use PublicInbox::InboxWritable;
+my $usage = "usage: $0 NAME EMAIL DIR \$dry_run,
+ 'V|version=i' => \$version,
+ 'F|format=s' => \$variant,
+ 'filter=s' => \$filter,
+);
+GetOptions(%opts) or die $usage;
+if ($variant ne 'mboxrd' && $variant ne 'mboxo') {
+ die "Unsupported mbox variant: $variant\n";
+}
my $name = shift or die $usage; # git
my $email = shift or die $usage; # git@vger.kernel.org
-my $im = PublicInbox::Import->new($git, $name, $email);
-binmode STDIN;
-my $msg = '';
-use PublicInbox::Filter::Vger;
-my $vger = PublicInbox::Filter::Vger->new;
-sub do_add ($$) {
- my ($im, $msg) = @_;
- $$msg =~ s/(\r?\n)+\z/$1/s;
- $msg = Email::MIME->new($$msg);
- $msg = $vger->scrub($msg);
- $im->add($msg) or
- warn "duplicate: ",
- $msg->header_obj->header_raw('Message-ID'), "\n";
-}
-
-# asctime: From example@example.com Fri Jun 23 02:56:55 2000
-my $from_strict = qr/^From \S+ \S+ \S+ +\S+ [^:]+:[^:]+:[^:]+ [^:]+/;
-my $prev = undef;
-while (defined(my $l = )) {
- if ($l =~ /$from_strict/o) {
- if (!defined($prev) || $prev =~ /^\r?$/) {
- do_add($im, \$msg) if $msg;
- $msg = '';
- $prev = $l;
- next;
- }
- warn "W[$.] $l\n";
+my $inboxdir = shift or die $usage; # /path/to/v2/repo
+my $ibx = {
+ inboxdir => $inboxdir,
+ name => $name,
+ version => $version,
+ address => [ $email ],
+ filter => $filter,
+};
+$ibx = PublicInbox::Inbox->new($ibx);
+unless ($dry_run) {
+ if ($version >= 2) {
+ require PublicInbox::V2Writable;
+ PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0);
+ } else {
+ system(qw(git init --bare -q), $inboxdir) == 0 or die;
}
- $prev = $l;
- $msg .= $l;
}
-do_add($im, \$msg) if $msg;
-$im->done;
+$ibx = PublicInbox::InboxWritable->new($ibx);
+binmode STDIN;
+$ibx->import_mbox(\*STDIN, $variant);