Skip to content

Defer visible/invisible HTML rendering until actually requested #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bigio wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Defer visible/invisible HTML rendering until actually requested #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/Mail/SpamAssassin/Message.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,7 @@ sub finish {
delete $part->{'rendered'};
delete $part->{'visible_rendered'};
delete $part->{'invisible_rendered'};
delete $part->{'html_obj'};
delete $part->{'type'};
delete $part->{'rendered_type'};
delete $part->{'effective_type'};
Expand Down
15 changes: 13 additions & 2 deletions lib/Mail/SpamAssassin/Message/Node.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,8 +860,11 @@ sub rendered {

# resulting HTML-decoded text is in perl characters (utf8 flag on)
$self->{rendered} = $html->get_rendered_text();
$self->{visible_rendered} = $html->get_rendered_text(invisible => 0);
$self->{invisible_rendered} = $html->get_rendered_text(invisible => 1);
# visible_rendered/invisible_rendered are each a further full pass over
# the rendered text (mask + whitespace cleanup); defer computing them
# until visible_rendered()/invisible_rendered() are actually called,
# which many rulesets never need for a given part.
$self->{html_obj} = $html;
$self->{html_results} = $html->get_results();

# end-of-document result values that require looking at the text
Expand Down Expand Up @@ -950,6 +953,10 @@ Render and return the visible text in this part.
sub visible_rendered {
my ($self) = @_;
$self->rendered(); # ignore return, we want just this:
if (!exists $self->{visible_rendered}) {
$self->{visible_rendered} = $self->{html_obj}
? $self->{html_obj}->get_rendered_text(invisible => 0) : $self->{rendered};
}
return ($self->{rendered_type}, $self->{visible_rendered});
}

Expand All @@ -962,6 +969,10 @@ Render and return the invisible text in this part.
sub invisible_rendered {
my ($self) = @_;
$self->rendered(); # ignore return, we want just this:
if (!exists $self->{invisible_rendered}) {
$self->{invisible_rendered} = $self->{html_obj}
? $self->{html_obj}->get_rendered_text(invisible => 1) : '';
}
return ($self->{rendered_type}, $self->{invisible_rendered});
}

Expand Down