X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=2f141c4413b9473e0f4ee3cdaaaa692633a95428;hb=e158d56a54d3c6d4890aa6ac4caa28a834279af0;hp=455b8e23362a9c0da82f462f407b0c5d4ec6e8bb;hpb=4b313dc74bc9bb84a542b7ec920cdb92879e7523;p=public-inbox.git diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 455b8e23..2f141c44 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -34,6 +34,32 @@ sub generate_html_index { sub { emit_html_index($_[0], $ctx) }; } +sub new_html { + my ($ctx) = @_; + my @paths; + my (undef, $last) = each_recent_blob($ctx, sub { + my ($path, $commit, $ts, $u, $subj) = @_; + $ctx->{first} ||= $commit; + push @paths, $path; + }); + if (!@paths) { + return [404, ['Content-Type', 'text/plain'], + ["No messages, yet\n"] ]; + } + $ctx->{-html_tip} = '
';
+	$ctx->{-upfx} = '';
+	PublicInbox::WwwStream->response($ctx, 200, sub {
+		while (my $path = shift @paths) {
+			my $m = do_cat_mail($ctx->{-inbox}, $path) or next;
+			my $more = scalar @paths;
+			my $s = PublicInbox::View::index_entry($m, $ctx, $more);
+			$s .= '
' unless $more; + return $s; + } + undef; + }); +} + # private subs sub title_tag { @@ -138,9 +164,12 @@ sub emit_html_index { my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]); my $max = $ctx->{max} || MAX_PER_PAGE; + $ctx->{-upfx} = ''; my ($footer, $param, $last); - my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh }; + $ctx->{seen} = {}; + $ctx->{anchor_idx} = 0; + $ctx->{fh} = $fh; my $srch = $ctx->{srch}; $fh->write(_html_index_top($feed_opts, $srch)); @@ -148,14 +177,13 @@ sub emit_html_index { # which we must continue supporting: my $qp = $ctx->{qp}; if ($qp && !$qp->{r} && $srch) { - $state->{srch} = $srch; - $last = PublicInbox::View::emit_index_topics($state); + $last = PublicInbox::View::emit_index_topics($ctx); $param = 'o'; } else { - $last = emit_index_nosrch($ctx, $state); + $last = emit_index_nosrch($ctx); $param = 'r'; } - $footer = nav_footer($ctx, $last, $feed_opts, $state, $param); + $footer = nav_footer($ctx, $last, $feed_opts, $param); if ($footer) { my $list_footer = $ctx->{footer}; $footer .= "\n\n" . $list_footer if $list_footer; @@ -166,27 +194,28 @@ sub emit_html_index { } sub emit_index_nosrch { - my ($ctx, $state) = @_; + my ($ctx) = @_; my $ibx = $ctx->{-inbox}; + my $fh = $ctx->{fh}; my (undef, $last) = each_recent_blob($ctx, sub { my ($path, $commit, $ts, $u, $subj) = @_; - $state->{first} ||= $commit; + $ctx->{first} ||= $commit; my $mime = do_cat_mail($ibx, $path) or return 0; - PublicInbox::View::index_entry($mime, 0, $state); + $fh->write(PublicInbox::View::index_entry($mime, $ctx, 1)); 1; }); $last; } sub nav_footer { - my ($ctx, $last, $feed_opts, $state, $param) = @_; + my ($ctx, $last, $feed_opts, $param) = @_; my $qp = $ctx->{qp} or return ''; my $old_r = $qp->{$param}; my $head = ' '; my $next = ' '; - my $first = $state->{first}; - my $anchor = $state->{anchor_idx}; + my $first = $ctx->{first}; + my $anchor = $ctx->{anchor_idx}; if ($last) { $next = qq!next!; @@ -317,7 +346,7 @@ sub feed_entry { my $from = $header_obj->header('From') or return; my ($email) = PublicInbox::Address::emails($from); - my $name = PublicInbox::Address::from_name($from); + my $name = join(', ',PublicInbox::Address::names($from)); $name = ascii_html($name); $email = ascii_html($email);