user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/9] lei_to_mail: cast to URIimap object early
Date: Fri, 16 Apr 2021 16:10:30 -0700	[thread overview]
Message-ID: <20210416231035.31807-5-e@80x24.org> (raw)
In-Reply-To: <20210416231035.31807-1-e@80x24.org>

NetReader->add_url supports URI-like objects, now.  We'll be
relying on the canonicalization for LeiSavedSearch.
---
 lib/PublicInbox/LeiToMail.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 4ebaf8f3..daa8084b 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -335,14 +335,16 @@ sub new {
 		$self->{base_type} = 'mbox';
 	} elsif ($fmt =~ /\Aimaps?\z/) { # TODO .onion support
 		require PublicInbox::NetWriter;
+		require PublicInbox::URIimap;
 		my $net = PublicInbox::NetWriter->new;
-		$net->add_url($dst);
 		$net->{quiet} = $lei->{opt}->{quiet};
-		my $err = $net->errors($dst);
+		my $uri = PublicInbox::URIimap->new($dst)->canonical;
+		$net->add_url($uri);
+		my $err = $net->errors;
 		return $lei->fail($err) if $err;
-		require PublicInbox::URIimap; # TODO: URI cast early
-		$self->{uri} = PublicInbox::URIimap->new($dst);
-		$self->{uri}->mailbox or die "No mailbox: $dst";
+		$uri->mailbox or return $lei->fail("No mailbox: $dst");
+		$self->{uri} = $uri;
+		$dst = $lei->{ovv}->{dst} = $$uri; # canonicalized
 		$lei->{net} = $net;
 		$self->{base_type} = 'imap';
 	} else {

  parent reply	other threads:[~2021-04-16 23:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-16 23:10 [PATCH 0/9] lei saved search usability improvements Eric Wong
2021-04-16 23:10 ` [PATCH 1/9] lei q: --save preserves relative time queries Eric Wong
2021-04-16 23:10 ` [PATCH 2/9] lei: expose share_path as a method Eric Wong
2021-04-16 23:10 ` [PATCH 3/9] lei: saved searches keyed only by path/URL and format Eric Wong
2021-04-16 23:10 ` Eric Wong [this message]
2021-04-16 23:10 ` [PATCH 5/9] test_common: handle '-C' (chdir) spawn option properly Eric Wong
2021-04-17  2:24   ` [SQUASH] test_common: fix -C $DIR with TEST_RUN_MODE=0 Eric Wong
2021-04-17 10:00     ` [PATCH 10/9] lei_query: fix relative path handling on --stdin Eric Wong
2021-04-16 23:10 ` [PATCH 6/9] lei: fix rel2abs Eric Wong
2021-04-16 23:10 ` [PATCH 7/9] lei up: support output destination as arg Eric Wong
2021-04-16 23:10 ` [PATCH 8/9] lei q --save: avoid lei.q.format Eric Wong
2021-04-16 23:10 ` [PATCH 9/9] lei q --save: clobber config file on repeats 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=20210416231035.31807-5-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --subject='Re: [PATCH 4/9] lei_to_mail: cast to URIimap object early' \
    /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

user/dev discussion of public-inbox itself

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \
		meta@public-inbox.org
	public-inbox-index meta

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.mail.public-inbox.meta
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.mail.public-inbox.meta
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/public-inbox.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git