index group state parameters together for generation

This allows us to more-easily group and pass parameters.

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 385e573e6bff9745474184f2f386dfb2f9608b50..1fa38bf111749af663790bc86d8143b57d8bd486 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -86,14 +86,14 @@ sub generate_html_index {
                } @_;
        });
 
-       my %seen;
        # except we sort top-level messages reverse chronologically
+       my $state = [ time, {}, $first ];
        for (sort { (eval { $b->message->header('X-PI-Date') } || 0) <=>
                    (eval { $a->message->header('X-PI-Date') } || 0)
                  } $th->rootset) {
-               dump_msg($_, 0, \$html, time, \%seen, $first);
+               dump_msg($_, 0, \$html, $state);
        }
-
+       $state = undef;
        Email::Address->purge_cache;
 
        my $footer = nav_footer($args->{cgi}, $first, $last, $feed_opts);
@@ -287,14 +287,13 @@ sub add_to_feed {
 }
 
 sub dump_msg {
-       my ($self, $level, $html, $now, $seen, $first) = @_;
+       my ($self, $level, $html, $state) = @_;
        my $mime = $self->message;
        if ($mime) {
-               $$html .= PublicInbox::View->index_entry($mime, $now, $level,
-                                                        $seen, $first);
+               $$html .= PublicInbox::View->index_entry($mime, $level, $state);
        }
-       dump_msg($self->child, $level+1, $html, $now, $seen, $first) if $self->child;
-       dump_msg($self->next, $level, $html, $now, $seen, $first) if $self->next;
+       dump_msg($self->child, $level+1, $html, $state) if $self->child;
+       dump_msg($self->next, $level, $html, $state) if $self->next;
 }
 
 sub do_cat_mail {

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index d3849dcc8978cd03b09f17cde3e4682ad2125e0b..b3797d39ae06a6ea4747d7bd0f15b3a462b770a0 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -43,8 +43,9 @@ sub feed_entry {
 
 # this is already inside a <pre>
 sub index_entry {
-       my ($class, $mime, $now, $level, $seen, $first) = @_;
-       my $rv = "";
+       my ($class, $mime, $level, $state) = @_;
+       my ($now, $seen, $first) = @$state;
+       my $rv = '';
        my $part_nr = 0;
        my $enc_msg = enc_for($mime->header("Content-Type"));
        my $subj = $mime->header('Subject');