www*stream: gzip ->getline responses

[public-inbox.git] / lib / PublicInbox / InboxWritable.pm

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 31aa76c627b8897c891cfd186fb888868a4aed17..875dcce20b70953b6ebbfcbfad3154a07018678f 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -39,10 +39,25 @@ sub assert_usable_dir {
 
 sub init_inbox {
        my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
-       # TODO: honor skip_artnum
        if ($self->version == 1) {
                my $dir = assert_usable_dir($self);
                PublicInbox::Import::init_bare($dir);
+               if (defined($self->{indexlevel}) || defined($skip_artnum)) {
+                       require PublicInbox::SearchIdx;
+                       require PublicInbox::Msgmap;
+                       my $sidx = PublicInbox::SearchIdx->new($self, 1); # just create
+                       $sidx->begin_txn_lazy;
+                       $self->with_umask(sub {
+                               my $mm = PublicInbox::Msgmap->new($dir, 1);
+                               $mm->{dbh}->begin_work;
+                               $mm->skip_artnum($skip_artnum);
+                               $mm->{dbh}->commit;
+                       }) if defined($skip_artnum);
+                       $sidx->commit_txn_lazy;
+               } else {
+                       open my $fh, '>>', "$dir/ssoma.lock" or
+                               die "$dir/ssoma.lock: $!\n";
+               }
        } else {
                my $v2w = importer($self);
                $v2w->init_inbox($shards, $skip_epoch, $skip_artnum);
@@ -57,7 +72,7 @@ sub importer {
                die "v2 not supported: $@\n" if $@;
                my $opt = $self->{-creat_opt};
                my $v2w = PublicInbox::V2Writable->new($self, $opt);
-               $v2w->{parallel} = $parallel;
+               $v2w->{parallel} = $parallel if defined $parallel;
                $v2w;
        } elsif ($v == 1) {
                my @arg = (undef, undef, undef, $self);
@@ -117,7 +132,7 @@ sub mime_from_path ($) {
                local $/;
                my $str = <$fh>;
                $str or return;
-               return PublicInbox::MIME->new(\$str);
+               return PublicInbox::Eml->new(\$str);
        } elsif ($!{ENOENT}) {
                # common with Maildir
                return;
@@ -162,7 +177,7 @@ sub mb_add ($$$$) {
        } elsif ($variant eq 'mboxo') {
                $$msg =~ s/^>From /From /gms;
        }
-       my $mime = PublicInbox::MIME->new($msg);
+       my $mime = PublicInbox::Eml->new($msg);
        if ($filter) {
                my $ret = $filter->scrub($mime) or return;
                return if $ret == REJECT();