From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 0FB451F4C6 for ; Wed, 31 Jan 2024 10:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1706696422; bh=phmLdinkpQznmx3ryoYofleO2aPO3fhtdasUtCu/lxc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=GjiZnZ8FDIgi/QSvCnSmcs7PpD+DYqTi8BtX5n4H4HlmB25mbnjf0lnk0MErApXnk xVVORvxvIXYmbvxFdg4amOBl1R6ofLHMa1XqgVdu0MGBbGc1e3rbaOfTKDSjBYbuJC KtF9debbZQ8hHvIW9ZORpXod8HEESxEnGc5Rq3hE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 5/5] lei: sort MH inputs sequentially by default Date: Wed, 31 Jan 2024 10:20:20 +0000 Message-ID: <20240131102021.1257902-6-e@80x24.org> In-Reply-To: <20240131102021.1257902-1-e@80x24.org> References: <20240131102021.1257902-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: MH sequence numbers can be analogous to IMAP UIDs and NNTP article numbers (or more like IMAP MSNs with clients which pack). In any case, sort then numerically by default to avoid surprising users who treat NNTP spools and mlmmj archives as MH folders. This gives more coherent git history and resulting NNTP/IMAP numbering when round-tripping MH -> v2 -> (NNTP|IMAP) -> MH --- lib/PublicInbox/LeiInput.pm | 2 +- lib/PublicInbox/MHreader.pm | 3 ++- t/mh_reader.t | 14 ++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm index 947a7a79..d003d983 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -242,7 +242,7 @@ sub input_path_url { } } elsif (-d _ && $ifmt eq 'mh') { my $mhr = PublicInbox::MHreader->new($input.'/', $lei->{3}); - $mhr->{sort} = $lei->{opt}->{sort}; + $mhr->{sort} = $lei->{opt}->{sort} // [ 'sequence']; $mhr->mh_each_eml($self->can('input_mh_cb'), $self, @args); } elsif (-d _ && $ifmt =~ /\A(?:v1|v2)\z/) { my $ibx = PublicInbox::Inbox->new({inboxdir => $input}); diff --git a/lib/PublicInbox/MHreader.pm b/lib/PublicInbox/MHreader.pm index 033aa740..3e7bbd5c 100644 --- a/lib/PublicInbox/MHreader.pm +++ b/lib/PublicInbox/MHreader.pm @@ -54,7 +54,8 @@ sub mh_each_file { opendir(my $dh, my $dir = $self->{dir}); my $restore = PublicInbox::OnDestroy->new($$, \&chdir, $self->{cwdfh}); chdir($dh); - if (defined(my $sort = $self->{sort})) { + my $sort = $self->{sort}; + if (defined $sort && "@$sort" ne 'none') { my @sort = map { my @tmp = $_ eq '' ? ('sequence') : split(/[, ]/); # sorting by name alphabetically makes no sense for MH: diff --git a/t/mh_reader.t b/t/mh_reader.t index 711fc8aa..c81df32e 100644 --- a/t/mh_reader.t +++ b/t/mh_reader.t @@ -7,6 +7,7 @@ use PublicInbox::IO qw(write_file); use PublicInbox::Lock; use PublicInbox::OnDestroy; use PublicInbox::Eml; +use File::Path qw(remove_tree); use autodie; opendir my $cwdfh, '.'; @@ -103,12 +104,17 @@ test_lei(sub { like $lei_out, qr/^Subject: msg 4\nStatus: RO\n\n\n/ms, "message retrieved after `lei index'"; + lei_ok qw(convert -s none -f text), "mh:$for_sort", \'--sort=none'; + # ensure sort works for _input_ when output disallows sort my $v2out = "$ENV{HOME}/v2-out"; - lei_ok qw(convert -s sequence), "mh:$for_sort", '-o', "v2:$v2out"; - my $git = PublicInbox::Git->new("$v2out/git/0.git"); - chomp(my @l = $git->qx(qw(log --pretty=oneline --format=%s))); - is_xdeeply \@l, [1, 22, 333], 'sequence order preserved for v2'; + for my $sort (['--sort=sequence'], []) { # sequence is the default + lei_ok qw(convert), @$sort, "mh:$for_sort", '-o', "v2:$v2out"; + my $g = PublicInbox::Git->new("$v2out/git/0.git"); + chomp(my @l = $g->qx(qw(log --pretty=oneline --format=%s))); + is_xdeeply \@l, [1, 22, 333], 'sequence order preserved for v2'; + File::Path::remove_tree $v2out; + } }); done_testing;