use Email::MIME;
use Date::Parse qw(strptime);
use PublicInbox::Hval qw/ascii_html/;
-use PublicInbox::Git;
use PublicInbox::View;
use PublicInbox::MID qw/mid_clean mid2path/;
use PublicInbox::Address;
sub generate_html_index {
my ($ctx) = @_;
- sub { emit_html_index($_[0], $ctx) };
+ # if the 'r' query parameter is given, it is a legacy permalink
+ # which we must continue supporting:
+ my $qp = $ctx->{qp};
+ if ($qp && !$qp->{r} && $ctx->{srch}) {
+ return PublicInbox::View::index_topics($ctx);
+ }
+
+ my $env = $ctx->{env};
+ my $url = $ctx->{-inbox}->base_url($env) . 'new.html';
+ my $qs = $env->{QUERY_STRING};
+ $url .= "?$qs" if $qs ne '';
+ [302, [ 'Location', $url, 'Content-Type', 'text/plain'],
+ [ "Redirecting to $url\n" ] ];
}
sub new_html {
}
$ctx->{-html_tip} = '<pre>';
$ctx->{-upfx} = '';
+ $ctx->{-hr} = 1;
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 .= '</pre>' unless $more;
return $s;
}
- undef;
+ new_html_footer($ctx, $last);
});
}
my $fh = $cb->([200, ['Content-Type' => 'application/atom+xml']]);
my $ibx = $ctx->{-inbox};
my $html_url = $ibx->base_url($ctx->{env});
- $html_url .= PublicInbox::Hval->new_msgid($mid)->as_href;
+ $html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
$feed_opts->{url} = $html_url;
$feed_opts->{emit_header} = 1;
end_feed($fh);
}
-sub _html_index_top {
- my ($feed_opts, $srch) = @_;
-
- my $title = ascii_html($feed_opts->{description} || '');
- my $top = "<b>$title</b> (<a\nhref=\"new.atom\">Atom feed</a>)";
- if ($srch) {
- $top = qq{<form\naction=""><pre>$top} .
- qq{ <input\nname=q\ntype=text />} .
- qq{<input\ntype=submit\nvalue=search />} .
- q{</pre></form><pre>}
- } else {
- $top = '<pre>' . $top . "\n";
- }
-
- "<html><head><title>$title</title>" .
- "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
- "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
- PublicInbox::Hval::STYLE .
- "</head><body>$top";
-}
-
-sub emit_html_index {
- my ($res, $ctx) = @_;
- my $feed_opts = get_feedopts($ctx);
- my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
-
- my $max = $ctx->{max} || MAX_PER_PAGE;
- $ctx->{-upfx} = '';
-
- my ($footer, $param, $last);
- $ctx->{seen} = {};
- $ctx->{anchor_idx} = 0;
- $ctx->{fh} = $fh;
- my $srch = $ctx->{srch};
- $fh->write(_html_index_top($feed_opts, $srch));
-
- # if the 'r' query parameter is given, it is a legacy permalink
- # which we must continue supporting:
- my $qp = $ctx->{qp};
- if ($qp && !$qp->{r} && $srch) {
- $last = PublicInbox::View::emit_index_topics($ctx);
- $param = 'o';
- } else {
- $last = emit_index_nosrch($ctx);
- $param = 'r';
- }
- $footer = nav_footer($ctx, $last, $feed_opts, $param);
- if ($footer) {
- my $list_footer = $ctx->{footer};
- $footer .= "\n\n" . $list_footer if $list_footer;
- $footer = "<hr><pre>$footer</pre>";
- }
- $fh->write("$footer</body></html>");
- $fh->close;
-}
-
-sub emit_index_nosrch {
- my ($ctx) = @_;
- my $ibx = $ctx->{-inbox};
- my $fh = $ctx->{fh};
- my (undef, $last) = each_recent_blob($ctx, sub {
- my ($path, $commit, $ts, $u, $subj) = @_;
- $ctx->{first} ||= $commit;
-
- my $mime = do_cat_mail($ibx, $path) or return 0;
- $fh->write(PublicInbox::View::index_entry($mime, $ctx, 1));
- 1;
- });
- $last;
-}
-
-sub nav_footer {
- my ($ctx, $last, $feed_opts, $param) = @_;
- my $qp = $ctx->{qp} or return '';
- my $old_r = $qp->{$param};
- my $head = ' ';
+sub new_html_footer {
+ my ($ctx, $last) = @_;
+ my $qp = delete $ctx->{qp} or return;
+ my $old_r = $qp->{r};
+ my $latest = '';
my $next = ' ';
- my $first = $ctx->{first};
- my $anchor = $ctx->{anchor_idx};
if ($last) {
- $next = qq!<a\nhref="?$param=$last"\nrel=next>next</a>!;
+ $next = qq!<a\nhref="?r=$last"\nrel=next>next</a>!;
}
if ($old_r) {
- $head = $ctx->{env}->{PATH_INFO};
- $head = qq!<a\nhref="$head">head</a>!;
+ $latest = qq! <a\nhref='./new.html'>latest</a>!;
}
- my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">Atom feed</a>";
- "<a\nname=\"s$anchor\">page:</a> $next $head $atom";
+ "<hr><pre>page: $next$latest</pre>";
}
sub each_recent_blob {
# private functions below
sub get_feedopts {
my ($ctx) = @_;
- my $pi_config = $ctx->{pi_config};
my $inbox = $ctx->{inbox};
my $obj = $ctx->{-inbox};
my %rv = ( description => $obj->description );
my $midurl = $feed_opts->{midurl};
my $header_obj = $mime->header_obj;
- my $mid = $header_obj->header_raw('Message-ID');
- defined $mid or return;
+ my $mid = mid_clean($header_obj->header_raw('Message-ID'));
$mid = PublicInbox::Hval->new_msgid($mid);
- my $href = $midurl . $mid->as_href . '/';
+ my $href = $midurl . $mid->{href}. '/';
my $date = $header_obj->header('Date');
my $updated = feed_updated($date);