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 {
+ 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} = '<pre>';
+ $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 .= '</pre>' unless $more;
+ return $s;
+ }
+ new_html_footer($ctx, $last);
+ });
}
# private subs
my $fh = $cb->([ 200, ['Content-Type' => 'application/atom+xml']]);
my $max = $ctx->{max} || MAX_PER_PAGE;
my $x = atom_header($feed_opts);
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+ my $ibx = $ctx->{-inbox};
each_recent_blob($ctx, sub {
my ($path, undef, $ts) = @_;
if (defined $x) {
$fh->write($x . feed_updated(undef, $ts));
$x = undef;
}
- my $s = feed_entry($feed_opts, $path, $git) or return 0;
+ my $s = feed_entry($feed_opts, $path, $ibx) or return 0;
$fh->write($s);
1;
});
sub emit_atom_thread {
my ($cb, $ctx) = @_;
- my $res = $ctx->{srch}->get_thread($ctx->{mid});
+ my $mid = $ctx->{mid};
+ my $res = $ctx->{srch}->get_thread($mid);
return _no_thread($cb) unless $res->{total};
my $feed_opts = get_feedopts($ctx);
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;
- my $html_url = $feed_opts->{atomurl} = $ctx->{self_url};
- $html_url =~ s!/t\.atom\z!/!;
$feed_opts->{url} = $html_url;
$feed_opts->{emit_header} = 1;
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
foreach my $msg (@{$res->{msgs}}) {
- my $s = feed_entry($feed_opts, mid2path($msg->mid), $git);
+ my $s = feed_entry($feed_opts, mid2path($msg->mid), $ibx);
$fh->write($s) if defined $s;
}
end_feed($fh);
"</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;
-
- my ($footer, $param, $last);
- my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, 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) {
- $state->{srch} = $srch;
- $last = PublicInbox::View::emit_index_topics($state);
- $param = 'o';
- } else {
- $last = emit_index_nosrch($ctx, $state);
- $param = 'r';
- }
- $footer = nav_footer($ctx, $last, $feed_opts, $state, $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, $state) = @_;
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
- my (undef, $last) = each_recent_blob($ctx, sub {
- my ($path, $commit, $ts, $u, $subj) = @_;
- $state->{first} ||= $commit;
-
- my $mime = do_cat_mail($git, $path) or return 0;
- PublicInbox::View::index_entry($mime, 0, $state);
- 1;
- });
- $last;
-}
-
-sub nav_footer {
- my ($ctx, $last, $feed_opts, $state, $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 = $state->{first};
- my $anchor = $state->{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 {
# get recent messages
# we could use git log -z, but, we already know ssoma will not
# leave us with filenames with spaces in them..
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
- my $log = $git->popen(qw/log --no-notes --no-color --raw -r
+ my $log = $ctx->{-inbox}->git->popen(qw/log
+ --no-notes --no-color --raw -r
--abbrev=16 --abbrev-commit/,
"--format=%h%x00%ct%x00%an%x00%s%x00",
$range);
# private functions below
sub get_feedopts {
my ($ctx) = @_;
- my $pi_config = $ctx->{pi_config};
my $inbox = $ctx->{inbox};
my $obj = $ctx->{-inbox};
- my $cgi = $ctx->{cgi};
- my %rv = ( description => $obj ? $obj->description : 'FIXME' );
-
- if ($obj) {
- $rv{address} = $obj->{address};
- $rv{id_addr} = $obj->{-primary_address};
- } elsif ($pi_config && defined $inbox && $inbox ne '') {
- # TODO: remove
- my $addr = $pi_config->get($inbox, 'address') || "";
- $rv{address} = $addr;
- $addr = $addr->[0] if ref($addr);
- $rv{id_addr} = $addr;
- }
- $rv{id_addr} ||= 'public-inbox@example.com';
-
- my $url_base;
- if ($obj) {
- $url_base = $obj->base_url($cgi); # CGI may be undef
- if (my $mid = $ctx->{mid}) { # per-thread feed:
- $rv{atomurl} = "$url_base$mid/t.atom";
- } else {
- $rv{atomurl} = $url_base."new.atom";
- }
+ my %rv = ( description => $obj->description );
+
+ $rv{address} = $obj->{address};
+ $rv{id_addr} = $obj->{-primary_address};
+ my $url_base = $obj->base_url($ctx->{env});
+ if (my $mid = $ctx->{mid}) { # per-thread feed:
+ $rv{atomurl} = "$url_base$mid/t.atom";
} else {
- $url_base = 'http://example.com/';
- $rv{atomurl} = $url_base.'new.atom';
+ $rv{atomurl} = $url_base."new.atom";
}
$rv{url} ||= $url_base;
$rv{midurl} = $url_base;
# returns undef or string
sub feed_entry {
- my ($feed_opts, $add, $git) = @_;
+ my ($feed_opts, $add, $ibx) = @_;
- my $mime = do_cat_mail($git, $add) or return;
+ my $mime = do_cat_mail($ibx, $add) or return;
my $url = $feed_opts->{url};
my $midurl = $feed_opts->{midurl};
my $mid = $header_obj->header_raw('Message-ID');
defined $mid or return;
$mid = PublicInbox::Hval->new_msgid($mid);
- my $href = $midurl.$mid->as_href;
+ my $href = $midurl . $mid->as_href . '/';
my $date = $header_obj->header('Date');
my $updated = feed_updated($date);
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);
my $h = '[a-f0-9]';
my (@uuid5) = ($add =~ m!\A($h{8})($h{4})($h{4})($h{4})($h{12})!o);
my $id = 'urn:uuid:' . join('-', @uuid5);
- $s .= qq!</div></content><link\nhref="$href/"/>!.
+ $s .= qq!</div></content><link\nhref="$href"/>!.
"<id>$id</id></entry>";
}
sub do_cat_mail {
- my ($git, $path) = @_;
- my $mime = eval {
- my $str = $git->cat_file("HEAD:$path");
- Email::MIME->new($str);
- };
- $@ ? undef : $mime;
+ my ($ibx, $path) = @_;
+ my $mime = eval { $ibx->msg_by_path($path) } or return;
+ Email::MIME->new($mime);
}
1;