* [PATCH] view: drop a newline before first attachment link
@ 2020-05-16 7:35 6% Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-05-16 7:35 UTC (permalink / raw)
To: meta
However, we'll always have a newline before subsequent
attachments links after the first.
For the initial part of a multipart message, this regression
appeared in 1.5.0, but the display was overly clumped in prior
relases, too.
Fixes: 453dee4881a9c764 ("msg_iter: pass $idx as a scalar, not array")
---
lib/PublicInbox/View.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index ef5f4b3a25e..7264f4b6997 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -483,7 +483,7 @@ sub multipart_text_as_html {
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
my ($part, $depth, $idx) = @$p;
- my $nl = substr($idx, -2) eq '.1' ? '' : "\n"; # like join("\n", ...)
+ my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
my $size = bytes::length($part->body);
# hide attributes normally, unless we want to aid users in
^ permalink raw reply related [relevance 6%]
* [PATCH 02/13] msg_iter: pass $idx as a scalar, not array
2020-05-07 21:05 5% [PATCH 00/13] eml: pure-Perl replacement for Email::MIME Eric Wong
@ 2020-05-07 21:05 7% ` Eric Wong
0 siblings, 0 replies; 3+ results
From: Eric Wong @ 2020-05-07 21:05 UTC (permalink / raw)
To: meta
This doesn't make any difference for most multipart
messages (or any single part messages). However,
this starts having space savings when parts start
nesting.
It also slightly simplifies callers.
---
lib/PublicInbox/MsgIter.pm | 6 ++++--
lib/PublicInbox/SearchIdx.pm | 2 +-
lib/PublicInbox/View.pm | 18 +++++++++---------
lib/PublicInbox/WwwAttach.pm | 4 ++--
t/mime.t | 5 +++--
t/msg_iter.t | 2 +-
6 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm
index cd5a5d99..7c28d019 100644
--- a/lib/PublicInbox/MsgIter.pm
+++ b/lib/PublicInbox/MsgIter.pm
@@ -20,12 +20,14 @@ sub em_each_part ($$;$$) {
my $i = 0;
@parts = map { [ $_, 1, ++$i ] } @parts;
while (my $p = shift @parts) {
- my ($part, $depth, @idx) = @$p;
+ my ($part, $depth, $idx) = @$p;
my @sub = $part->subparts;
if (@sub) {
$depth++;
$i = 0;
- @sub = map { [ $_, $depth, @idx, ++$i ] } @sub;
+ @sub = map {
+ [ $_, $depth, "$idx.".(++$i) ]
+ } @sub;
@parts = (@sub, @parts);
} else {
$cb->($p, $cb_arg);
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 25118f43..a7e31b71 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -277,7 +277,7 @@ sub index_diff ($$$) {
}
sub index_xapian { # msg_iter callback
- my $part = $_[0]->[0]; # ignore $depth and @idx
+ my $part = $_[0]->[0]; # ignore $depth and $idx
my ($self, $doc) = @{$_[1]};
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e42fb362..3328c865 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -482,9 +482,8 @@ sub multipart_text_as_html {
sub attach_link ($$$$;$) {
my ($ctx, $ct, $p, $fn, $err) = @_;
- my ($part, $depth, @idx) = @$p;
- my $nl = $idx[-1] > 1 ? "\n" : '';
- my $idx = join('.', @idx);
+ my ($part, $depth, $idx) = @$p;
+ my $nl = substr($idx, -2) eq '.1' ? '' : "\n"; # like join("\n", ...)
my $size = bytes::length($part->body);
# hide attributes normally, unless we want to aid users in
@@ -519,8 +518,8 @@ sub add_text_body { # callback for each_part
my ($p, $ctx) = @_;
my $upfx = $ctx->{mhref};
my $ibx = $ctx->{-inbox};
- # $p - from each_part: [ Email::MIME-like, depth, @idx ]
- my ($part, $depth, @idx) = @$p;
+ # $p - from each_part: [ Email::MIME-like, depth, $idx ]
+ my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
my ($s, $err) = msg_part_text($part, $ct);
@@ -537,13 +536,14 @@ sub add_text_body { # callback for each_part
# headers for solver unless some coderepo are configured:
my $diff;
if ($s =~ /^--- [^\n]+\n\+{3} [^\n]+\n@@ /ms) {
- # diffstat anchors do not link across attachments or messages:
- $idx[0] = $upfx . $idx[0] if $upfx ne '';
- $ctx->{-apfx} = join('/', @idx);
+ # diffstat anchors do not link across attachments or messages,
+ # -apfx is just a stable prefix for making diffstat anchors
+ # linkable to the first diff hunk w/o crossing attachments
+ $idx =~ tr!.!/!; # compatibility with previous versions
+ $ctx->{-apfx} = $upfx . $idx;
# do attr => filename mappings for diffstats in git diffs:
$ctx->{-anchors} = {} if $s =~ /^diff --git /sm;
-
$diff = 1;
delete $ctx->{-long_path};
my $spfx;
diff --git a/lib/PublicInbox/WwwAttach.pm b/lib/PublicInbox/WwwAttach.pm
index 774b38ae..b1009907 100644
--- a/lib/PublicInbox/WwwAttach.pm
+++ b/lib/PublicInbox/WwwAttach.pm
@@ -11,9 +11,9 @@ use PublicInbox::MIME;
use PublicInbox::MsgIter;
sub get_attach_i { # ->each_part callback
- my ($part, $depth, @idx) = @{$_[0]};
+ my ($part, $depth, $idx) = @{$_[0]};
my $res = $_[1];
- return if join('.', @idx) ne $res->[3]; # $idx
+ return if $idx ne $res->[3]; # [0-9]+(?:\.[0-9]+)+
$res->[0] = 200;
my $ct = $part->content_type;
$ct = parse_content_type($ct) if $ct;
diff --git a/t/mime.t b/t/mime.t
index 0d478ace..b9a4d66b 100644
--- a/t/mime.t
+++ b/t/mime.t
@@ -98,9 +98,10 @@ $msg = PublicInbox::MIME->new($raw);
my $nr = 0;
msg_iter($msg, sub {
my ($part, $level, @ex) = @{$_[0]};
- if ($ex[0] == 1) {
+ is($level, 1, 'at expected level');
+ if (join('fail if $#ex > 0', @ex) eq '1') {
is($part->body_str, "your tree directly? \r\n", 'body OK');
- } elsif ($ex[0] == 2) {
+ } elsif (join('fail if $#ex > 0', @ex) eq '2') {
is($part->body, "-----BEGIN PGP SIGNATURE-----\n\n" .
"=7wIb\n" .
"-----END PGP SIGNATURE-----\n",
diff --git a/t/msg_iter.t b/t/msg_iter.t
index 5c57e043..e8115e25 100644
--- a/t/msg_iter.t
+++ b/t/msg_iter.t
@@ -28,7 +28,7 @@ use_ok('PublicInbox::MsgIter');
$s =~ s/\s+//s;
push @parts, [ $s, $level, @ex ];
});
- is_deeply(\@parts, [ [qw(a 2 1 1)], [qw(b 2 1 2)], [qw(sig 1 2)] ],
+ is_deeply(\@parts, [ [qw(a 2 1.1)], [qw(b 2 1.2)], [qw(sig 1 2)] ],
'nested part shows up properly');
}
^ permalink raw reply related [relevance 7%]
* [PATCH 00/13] eml: pure-Perl replacement for Email::MIME
@ 2020-05-07 21:05 5% Eric Wong
2020-05-07 21:05 7% ` [PATCH 02/13] msg_iter: pass $idx as a scalar, not array Eric Wong
0 siblings, 1 reply; 3+ results
From: Eric Wong @ 2020-05-07 21:05 UTC (permalink / raw)
To: meta
Eric Wong (13):
msg_iter: make ->each_part method for PublicInbox::MIME
msg_iter: pass $idx as a scalar, not array
filter/rubylang: avoid recursing subparts to strip trailers
smsg: use capitalization for header retrieval
eml: pure-Perl replacement for Email::MIME
switch read-only Email::Simple users to Eml
replace most uses of PublicInbox::MIME with Eml
EmlContentFoo: Email::MIME::ContentType replacement
EmlContentFoo: relax Encode version requirement
eml: remove dependency on Email::MIME::Encodings
xt: eml comparison tests
remove most internal Email::MIME usage
eml: drop trailing blank line on missing epilogue
Documentation/mknews.perl | 4 +-
INSTALL | 26 +-
MANIFEST | 7 +
Makefile.PL | 7 +-
ci/deps.perl | 3 -
lib/PublicInbox/Admin.pm | 2 +-
lib/PublicInbox/Eml.pm | 421 +++++++++++++++++++++++++++++
lib/PublicInbox/EmlContentFoo.pm | 317 ++++++++++++++++++++++
lib/PublicInbox/Filter/RubyLang.pm | 32 ++-
lib/PublicInbox/Filter/Vger.pm | 4 +-
lib/PublicInbox/Import.pm | 11 +-
lib/PublicInbox/Inbox.pm | 4 +-
lib/PublicInbox/InboxWritable.pm | 4 +-
lib/PublicInbox/MDA.pm | 1 -
lib/PublicInbox/MIME.pm | 6 +
lib/PublicInbox/Mbox.pm | 16 +-
lib/PublicInbox/MboxGz.pm | 4 +-
lib/PublicInbox/MsgIter.pm | 21 +-
lib/PublicInbox/MsgTime.pm | 8 +-
lib/PublicInbox/NNTP.pm | 19 +-
lib/PublicInbox/SearchIdx.pm | 8 +-
lib/PublicInbox/SearchIdxShard.pm | 3 +-
lib/PublicInbox/Smsg.pm | 24 +-
lib/PublicInbox/SolverGit.pm | 4 +-
lib/PublicInbox/TestCommon.pm | 11 +-
lib/PublicInbox/V2Writable.pm | 17 +-
lib/PublicInbox/View.pm | 28 +-
lib/PublicInbox/WWW.pm | 8 +-
lib/PublicInbox/WatchMaildir.pm | 4 +-
lib/PublicInbox/WwwAttach.pm | 15 +-
script/public-inbox-edit | 8 +-
script/public-inbox-learn | 4 +-
script/public-inbox-mda | 16 +-
script/public-inbox-purge | 4 +-
t/altid.t | 4 +-
t/altid_v2.t | 4 +-
t/cgi.t | 8 +-
t/content_id.t | 6 +-
t/convert-compact.t | 4 +-
t/edit.t | 20 +-
t/eml.t | 363 +++++++++++++++++++++++++
t/eml_content_disposition.t | 102 +++++++
t/eml_content_type.t | 289 ++++++++++++++++++++
t/feed.t | 6 +-
t/filter_base.t | 4 +-
t/filter_mirror.t | 2 +-
t/filter_rubylang.t | 8 +-
t/filter_subjecttag.t | 4 +-
t/filter_vger.t | 6 +-
t/html_index.t | 4 +-
t/httpd.t | 4 +-
t/import.t | 6 +-
t/indexlevels-mirror.t | 4 +-
t/mda.t | 4 +-
t/mda_filter_rubylang.t | 2 +-
t/mid.t | 4 +-
t/mime.t | 82 +++---
t/msg_iter.t | 10 +-
t/msgtime.t | 6 +-
t/multi-mid.t | 6 +-
t/nntp.t | 4 +-
t/nntpd-tls.t | 4 +-
t/nntpd.t | 6 +-
t/nulsubject.t | 2 +-
t/plack.t | 10 +-
t/precheck.t | 10 +-
t/psgi_attach.t | 2 +-
t/psgi_bad_mids.t | 4 +-
t/psgi_mount.t | 4 +-
t/psgi_multipart_not.t | 4 +-
t/psgi_scan_all.t | 4 +-
t/psgi_search.t | 8 +-
t/psgi_text.t | 2 +-
t/psgi_v2.t | 6 +-
t/purge.t | 2 +-
t/replace.t | 12 +-
t/reply.t | 4 +-
t/search-thr-index.t | 6 +-
t/search.t | 26 +-
t/solver_git.t | 4 +-
t/spamcheck_spamc.t | 8 +-
t/thread-cycle.t | 3 +-
t/time.t | 4 +-
t/v1-add-remove-add.t | 4 +-
t/v1reindex.t | 4 +-
t/v2-add-remove-add.t | 4 +-
t/v2mda.t | 4 +-
t/v2mirror.t | 4 +-
t/v2reindex.t | 8 +-
t/v2writable.t | 8 +-
t/watch_filter_rubylang.t | 2 +-
t/watch_maildir.t | 2 +-
t/watch_maildir_v2.t | 2 +-
t/www_altid.t | 2 +-
t/xcpdb-reshard.t | 4 +-
xt/cmp-msgstr.t | 108 ++++++++
xt/cmp-msgview.t | 95 +++++++
xt/msgtime_cmp.t | 12 +-
xt/perf-msgview.t | 2 +-
99 files changed, 2084 insertions(+), 353 deletions(-)
create mode 100644 lib/PublicInbox/Eml.pm
create mode 100644 lib/PublicInbox/EmlContentFoo.pm
create mode 100644 t/eml.t
create mode 100644 t/eml_content_disposition.t
create mode 100644 t/eml_content_type.t
create mode 100644 xt/cmp-msgstr.t
create mode 100644 xt/cmp-msgview.t
^ permalink raw reply [relevance 5%]
Results 1-3 of 3 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-05-07 21:05 5% [PATCH 00/13] eml: pure-Perl replacement for Email::MIME Eric Wong
2020-05-07 21:05 7% ` [PATCH 02/13] msg_iter: pass $idx as a scalar, not array Eric Wong
2020-05-16 7:35 6% [PATCH] view: drop a newline before first attachment link 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).