From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH] lei: fix mail_sync.qlite3 folder names for NNTP Date: Tue, 4 May 2021 05:24:24 +0000 [thread overview] Message-ID: <20210504052424.23543-1-e@80x24.org> (raw) We should not have "SCALAR(XXXXXXX)" showing up in SQLite DBs because we passed a SCALAR ref instead of a non-ref SCALAR. --- lib/PublicInbox/NetReader.pm | 3 ++- t/lei-import-nntp.t | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm index 64910fe1..fd0d1682 100644 --- a/lib/PublicInbox/NetReader.pm +++ b/lib/PublicInbox/NetReader.pm @@ -628,6 +628,7 @@ sub _nntp_fetch_all ($$$) { warn "# $uri fetching ARTICLE $beg..$end\n"; } my $n = $self->{max_batch}; + my $url = $$uri; for ($beg..$end) { last if $self->{quit}; $art = $_; @@ -650,7 +651,7 @@ sub _nntp_fetch_all ($$$) { $raw = join('', @$raw); $raw =~ s/\r\n/\n/sg; my ($eml_cb, @args) = @{$self->{eml_each}}; - $eml_cb->($uri, $art, $kw, PublicInbox::Eml->new(\$raw), @args); + $eml_cb->($url, $art, $kw, PublicInbox::Eml->new(\$raw), @args); $last_art = $art; } run_commit_cb($self); diff --git a/t/lei-import-nntp.t b/t/lei-import-nntp.t index 12bb002a..662da309 100644 --- a/t/lei-import-nntp.t +++ b/t/lei-import-nntp.t @@ -16,10 +16,9 @@ test_lei({ tmpdir => $tmpdir }, sub { lei_ok(qw(q z:1..)); my $out = json_utf8->decode($lei_out); is_deeply($out, [ undef ], 'nothing imported, yet'); - lei_ok('import', "nntp://$host_port/t.v2"); - diag $lei_err; + my $url = "nntp://$host_port/t.v2"; + lei_ok('import', $url); lei_ok(qw(q z:1..)); - diag $lei_err; $out = json_utf8->decode($lei_out); ok(scalar(@$out) > 1, 'got imported messages'); is(pop @$out, undef, 'trailing JSON null element was null'); @@ -29,5 +28,7 @@ test_lei({ tmpdir => $tmpdir }, sub { my $f = "$ENV{HOME}/.local/share/lei/store/mail_sync.sqlite3"; ok(-s $f, 'mail_sync exists tracked for redundant imports'); + lei_ok 'ls-mail-sync'; + like($lei_out, qr!\A\Q$url\E\n\z!, 'ls-mail-sync output as-expected'); }); done_testing;
next reply other threads:[~2021-05-04 5:24 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-04 5:24 Eric Wong [this message] 2021-05-04 5:26 ` s/qlite3/s&/ [was: [PATCH] lei: fix ... folder names for NNTP] 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=20210504052424.23543-1-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ --subject='Re: [PATCH] lei: fix mail_sync.qlite3 folder names for NNTP' \ /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
Code repositories for project(s) associated with this inbox: https://80x24.org/public-inbox.git 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).