unofficial mirror of meta@public-inbox.org
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] lei q: fix --no-import-before completion + docs
Date: Tue, 28 Nov 2023 17:36:58 +0000	[thread overview]
Message-ID: <20231128173701.1472101-2-e@80x24.org> (raw)
In-Reply-To: <20231128173701.1472101-1-e@80x24.org>

--no-import-before skips importing entire messages, not just
keywords, so it can cause permanent data loss if -o is pointed
to precious data.
---
 Documentation/lei-q.pod |  5 +++--
 lib/PublicInbox/LEI.pm  |  1 +
 t/lei-q-kw.t            | 19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Documentation/lei-q.pod b/Documentation/lei-q.pod
index 4862ce78..95f3f702 100644
--- a/Documentation/lei-q.pod
+++ b/Documentation/lei-q.pod
@@ -108,8 +108,9 @@ Augment output destination instead of clobbering it.
 
 =item --no-import-before
 
-Do not import keywords before writing to an existing output
-destination.
+Do not import messages before writing to an existing output destination.
+Be certain you do not need existing data in your output before using
+this, it permanently erases data unless C<--augment> is used.
 
 =item --threads
 
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 86b71fcd..a89bdc51 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -353,6 +353,7 @@ my %OPTDESC = (
 'no-torsocks' => 'alias for --torsocks=no',
 'save!' =>  "do not save a search for `lei up'",
 'import-remote!' => 'do not memoize remote messages into local store',
+'import-before!' => 'do not import before writing to output (DANGEROUS)',
 
 'type=s' => [ 'any|mid|git', 'disambiguate type' ],
 
diff --git a/t/lei-q-kw.t b/t/lei-q-kw.t
index 06e1df6c..63e46037 100644
--- a/t/lei-q-kw.t
+++ b/t/lei-q-kw.t
@@ -9,6 +9,8 @@ use IO::Compress::Gzip qw(gzip);
 use PublicInbox::MboxReader;
 use PublicInbox::LeiToMail;
 use PublicInbox::Spawn qw(popen_rd);
+use File::Path qw(make_path);
+use PublicInbox::IO qw(write_file);
 my $exp = {
 	'<qp@example.com>' => eml_load('t/plack-qp.eml'),
 	'<testmessage@example.com>' => eml_load('t/utf8.eml'),
@@ -42,6 +44,19 @@ lei_ok(qw(q -o), "maildir:$o", qw(m:qp@example.com));
 @fn = glob("$o/cur/*:2,S");
 is(scalar(@fn), 1, "`seen' flag (but not `replied') set on Maildir file");
 
+{
+	$o = "$ENV{HOME}/dst-existing";
+	make_path(map { "$o/$_" } qw(new cur tmp));
+	my $bp = eml_load('t/data/binary.patch');
+	write_file '>', "$o/cur/binary-patch:2,S", $bp->as_string;
+	lei_ok qw(q --no-import-before m:qp@example.com -o), $o;
+	my @g = glob("$o/*/*");
+	is scalar(@g), 1, 'only newly imported message left';
+	is eml_load($g[0])->header_raw('Message-ID'), '<qp@example.com>';
+	lei qw(q m:binary-patch-test@example);
+	is $lei_out, "[null]\n", 'old message not imported';
+}
+
 SKIP: {
 	$o = "$ENV{HOME}/fifo";
 	mkfifo($o, 0600) or skip("mkfifo not supported: $!", 1);
@@ -80,9 +95,7 @@ my $write_file = sub {
 	if ($_[0] =~ /\.gz\z/) {
 		gzip(\($_[1]), $_[0]) or BAIL_OUT 'gzip';
 	} else {
-		open my $fh, '>', $_[0] or BAIL_OUT $!;
-		print $fh $_[1] or BAIL_OUT $!;
-		close $fh or BAIL_OUT;
+		write_file '>', $_[0], $_[1];
 	}
 };
 

  reply	other threads:[~2023-11-28 17:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-28 17:36 [PATCH 0/4] non-cindex-related stuff Eric Wong
2023-11-28 17:36 ` Eric Wong [this message]
2023-11-28 17:36 ` [PATCH 2/4] www: mail_diff: fix optional address obfuscation Eric Wong
2023-11-28 17:37 ` [PATCH 3/4] www: mail_diff: add final newline before diffing Eric Wong
2023-11-28 17:37 ` [PATCH 4/4] www: mail_diff: add missing </pre> tag Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231128173701.1472101-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).