X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=2f141c4413b9473e0f4ee3cdaaaa692633a95428;hb=e158d56a54d3c6d4890aa6ac4caa28a834279af0;hp=d88421b0d98ef11e4052770e85c592e3e5aede02;hpb=ecad69406fffd47b34ec28bba0b1c9d7fb333c61;p=public-inbox.git
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index d88421b0..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 {
@@ -65,14 +91,16 @@ sub emit_atom {
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;
}
- add_to_feed($feed_opts, $fh, $path, $git);
+ my $s = feed_entry($feed_opts, $path, $ibx) or return 0;
+ $fh->write($s);
+ 1;
});
end_feed($fh);
}
@@ -101,9 +129,10 @@ sub emit_atom_thread {
$feed_opts->{url} = $html_url;
$feed_opts->{emit_header} = 1;
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+ my $ibx = $ctx->{-inbox};
foreach my $msg (@{$res->{msgs}}) {
- add_to_feed($feed_opts, $fh, mid2path($msg->mid), $git);
+ my $s = feed_entry($feed_opts, mid2path($msg->mid), $ibx);
+ $fh->write($s) if defined $s;
}
end_feed($fh);
}
@@ -135,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));
@@ -145,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;
@@ -163,27 +194,28 @@ sub emit_html_index {
}
sub emit_index_nosrch {
- my ($ctx, $state) = @_;
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+ 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($git, $path) or return 0;
- PublicInbox::View::index_entry($mime, 0, $state);
+ 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, $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!;
@@ -215,8 +247,8 @@ 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);
@@ -266,31 +298,16 @@ sub get_feedopts {
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 %rv = ( description => $obj->description );
+ $rv{address} = $obj->{address};
+ $rv{id_addr} = $obj->{-primary_address};
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";
- }
+ $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 {
- $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;
@@ -306,61 +323,57 @@ sub feed_updated {
'' . strftime(DATEFMT, @t) . '';
}
-# returns 0 (skipped) or 1 (added)
-sub add_to_feed {
- my ($feed_opts, $fh, $add, $git) = @_;
+# returns undef or string
+sub feed_entry {
+ my ($feed_opts, $add, $ibx) = @_;
- my $mime = do_cat_mail($git, $add) or return 0;
+ my $mime = do_cat_mail($ibx, $add) or return;
my $url = $feed_opts->{url};
my $midurl = $feed_opts->{midurl};
my $header_obj = $mime->header_obj;
my $mid = $header_obj->header_raw('Message-ID');
- defined $mid or return 0;
+ defined $mid or return;
$mid = PublicInbox::Hval->new_msgid($mid);
my $href = $midurl.$mid->as_href;
- my $content = qq() .
- PublicInbox::View::multipart_text_as_html($mime, $href) .
- '';
my $date = $header_obj->header('Date');
my $updated = feed_updated($date);
my $title = $header_obj->header('Subject');
- defined $title or return 0;
+ defined $title or return;
$title = title_tag($title);
- my $from = $header_obj->header('From') or return 0;
+ 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 $s = '';
if (delete $feed_opts->{emit_header}) {
- $fh->write(atom_header($feed_opts, $title) . $updated);
+ $s .= atom_header($feed_opts, $title) . $updated;
}
- $fh->write("$name$email" .
- "$title$updated" .
- qq{} .
- qq{});
- $fh->write($content);
+ $s .= "$name$email" .
+ "$title$updated" .
+ qq{} .
+ qq{} .
+ qq() .
+ PublicInbox::View::multipart_text_as_html($mime, $href) .
+ '';
$add =~ tr!/!!d;
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);
- $fh->write(qq!!.
- "$id");
- 1;
+ $s .= qq!!.
+ "$id";
}
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;