user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
* [PATCH] import: use common address parsing to drop unnecessary quotes
@ 2016-08-15  1:54 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2016-08-15  1:54 UTC (permalink / raw)
  To: meta

Not sure why or how I missed this before; but the common address
parsing routine we have should be more correct.

Add a test to ensure excessively quoted names don't make it
through, either.
---
 lib/PublicInbox/Import.pm | 8 ++++----
 t/address.t               | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index 9555d27..c2beb19 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -10,6 +10,7 @@ use warnings;
 use Fcntl qw(:flock :DEFAULT);
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MID qw(mid_mime mid2path);
+use PublicInbox::Address;
 
 sub new {
 	my ($class, $git, $name, $email, $inbox) = @_;
@@ -145,14 +146,13 @@ sub add {
 	my ($self, $mime, $check_cb) = @_; # mime = Email::MIME
 
 	my $from = $mime->header('From');
-	my ($email) = ($from =~ /([^<\s]+\@[^>\s]+)/g);
-	my $name = $from;
-	$name =~ s/\s*\S+\@\S+\s*\z//;
+	my ($email) = PublicInbox::Address::emails($from);
+	my ($name) = PublicInbox::Address::names($from);
 	# git gets confused with:
 	#  "'A U Thor <u@example.com>' via foo" <foo@example.com>
 	# ref:
 	# <CAD0k6qSUYANxbjjbE4jTW4EeVwOYgBD=bXkSu=akiYC_CB7Ffw@mail.gmail.com>
-	$name =~ tr/<>// and $name = $email;
+	$name =~ tr/<>//d;
 
 	my $date = $mime->header('Date');
 	my $subject = $mime->header('Subject');
diff --git a/t/address.t b/t/address.t
index 287fcfa..be0fc5b 100644
--- a/t/address.t
+++ b/t/address.t
@@ -29,4 +29,8 @@ is_deeply(['user'], \@names, 'address-as-name extraction works as expected');
 	is_deeply(\@emails, ['u@example.com'], 'backwards emails OK');
 }
 
+
+@names = PublicInbox::Address::names('"Quote Unneeded" <user@example.com>');
+is_deeply(['Quote Unneeded'], \@names, 'extra quotes dropped');
+
 done_testing;
-- 
EW


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-08-15  1:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-15  1:54 [PATCH] import: use common address parsing to drop unnecessary quotes Eric Wong

Code repositories for project(s) associated with this public 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).