X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=e5d57550f414140fd7c1fc4f182bb8657b3e0169;hb=3fc59df0d633a17e0c5e43d633d12e8772c06ec3;hp=0b864c2c272cdaa54aa968dbebea09e59106bca1;hpb=803af0b41639ce7f4976c7dca77367485473bb30;p=public-inbox.git

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 0b864c2c..e5d57550 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -5,208 +5,122 @@
 package PublicInbox::Feed;
 use strict;
 use warnings;
-use Email::Address;
-use Email::MIME;
-use Date::Parse qw(strptime);
-use PublicInbox::Hval qw/ascii_html/;
-use PublicInbox::Git;
+use PublicInbox::MIME;
 use PublicInbox::View;
-use PublicInbox::MID qw/mid_clean mid2path/;
-use POSIX qw/strftime/;
-use constant {
-	DATEFMT => '%Y-%m-%dT%H:%M:%SZ', # Atom standard
-	MAX_PER_PAGE => 25, # this needs to be tunable
-};
+use PublicInbox::WwwAtomStream;
 
 # main function
 sub generate {
 	my ($ctx) = @_;
-	sub { emit_atom($_[0], $ctx) };
+	my @paths;
+	each_recent_blob($ctx, sub { push @paths, $_[0] });
+	return _no_thread() unless @paths;
+
+	my $ibx = $ctx->{-inbox};
+	PublicInbox::WwwAtomStream->response($ctx, 200, sub {
+		while (my $path = shift @paths) {
+			my $mime = do_cat_mail($ibx, $path) or next;
+			return $mime;
+		}
+	});
 }
 
 sub generate_thread_atom {
 	my ($ctx) = @_;
-	sub { emit_atom_thread($_[0], $ctx) };
-}
-
-sub generate_html_index {
-	my ($ctx) = @_;
-	sub { emit_html_index($_[0], $ctx) };
-}
-
-# private subs
-
-sub title_tag {
-	my ($title) = @_;
-	$title =~ tr/\t\n / /s; # squeeze spaces
-	# try to avoid the type attribute in title:
-	$title = ascii_html($title);
-	my $type = index($title, '&') >= 0 ? "\ntype=\"html\"" : '';
-	"<title$type>$title</title>";
-}
-
-sub atom_header {
-	my ($feed_opts, $title) = @_;
-
-	$title = title_tag($feed_opts->{description}) unless (defined $title);
-
-	qq(<?xml version="1.0" encoding="us-ascii"?>\n) .
-	qq{<feed\nxmlns="http://www.w3.org/2005/Atom">} .
-	qq{$title} .
-	qq(<link\nrel="alternate"\ntype="text/html") .
-		qq(\nhref="$feed_opts->{url}"/>) .
-	qq(<link\nrel="self"\nhref="$feed_opts->{atomurl}"/>) .
-	qq(<id>mailto:$feed_opts->{id_addr}</id>);
-}
-
-sub emit_atom {
-	my ($cb, $ctx) = @_;
-	my $feed_opts = get_feedopts($ctx);
-	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});
-	each_recent_blob($ctx, sub {
-		my ($path, undef, $ts) = @_;
-		if (defined $x) {
-			$fh->write($x . feed_updated(undef, $ts));
-			$x = undef;
+	my $mid = $ctx->{mid};
+	my $res = $ctx->{srch}->get_thread($mid);
+	return _no_thread() unless $res->{total};
+
+	my $ibx = $ctx->{-inbox};
+	my $html_url = $ibx->base_url($ctx->{env});
+	$html_url .= PublicInbox::Hval->new_msgid($mid)->{href};
+	$ctx->{-html_url} = $html_url;
+	my $msgs = $res->{msgs};
+	PublicInbox::WwwAtomStream->response($ctx, 200, sub {
+		while (my $msg = shift @$msgs) {
+			$msg = $ibx->msg_by_smsg($msg) and
+				return PublicInbox::MIME->new($msg);
 		}
-		add_to_feed($feed_opts, $fh, $path, $git);
 	});
-	end_feed($fh);
-}
-
-sub _no_thread {
-	my ($cb) = @_;
-	my $fh = $cb->([404, ['Content-Type' => 'text/plain']]);
-	$fh->write("No feed found for thread\n");
-	$fh->close;
-}
-
-sub end_feed {
-	my ($fh) = @_;
-	Email::Address->purge_cache;
-	$fh->write('</feed>');
-	$fh->close;
 }
 
-sub emit_atom_thread {
-	my ($cb, $ctx) = @_;
-	my $res = $ctx->{srch}->get_thread($ctx->{mid});
-	return _no_thread($cb) unless $res->{total};
-	my $feed_opts = get_feedopts($ctx);
-	my $fh = $cb->([200, ['Content-Type' => 'application/atom+xml']]);
-
-	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}}) {
-		add_to_feed($feed_opts, $fh, mid2path($msg->mid), $git);
-	}
-	end_feed($fh);
-}
-
-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 $title = ascii_html($feed_opts->{description} || '');
-	my ($footer, $param, $last);
-	my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
-	my $srch = $ctx->{srch};
-
-	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";
-	}
-
-	$fh->write("<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 generate_html_index {
+	my ($ctx) = @_;
 	# if the 'r' query parameter is given, it is a legacy permalink
 	# which we must continue supporting:
-	my $cgi = $ctx->{cgi};
-	if ($cgi && !$cgi->param('r') && $srch) {
-		$state->{srch} = $srch;
-		$last = PublicInbox::View::emit_index_topics($state);
-		$param = 'o';
-	} else {
-		$last = emit_index_nosrch($ctx, $state);
-		$param = 'r';
+	my $qp = $ctx->{qp};
+	if ($qp && !$qp->{r} && $ctx->{srch}) {
+		return PublicInbox::View::index_topics($ctx);
 	}
-	$footer = nav_footer($cgi, $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;
+
+	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 emit_index_nosrch {
-	my ($ctx, $state) = @_;
-	my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+sub new_html {
+	my ($ctx) = @_;
+	my @paths;
 	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;
+		$ctx->{first} ||= $commit;
+		push @paths, $path;
+	});
+	if (!@paths) {
+		return [404, ['Content-Type', 'text/plain'],
+			["No messages, yet\n"] ];
+	}
+	$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);
+			return $s;
+		}
+		new_html_footer($ctx, $last);
 	});
-	Email::Address->purge_cache;
-	$last;
 }
 
-sub nav_footer {
-	my ($cgi, $last, $feed_opts, $state, $param) = @_;
-	$cgi or return '';
-	my $old_r = $cgi->param($param);
-	my $head = '    ';
+# private subs
+
+sub _no_thread () {
+	[404, ['Content-Type', 'text/plain'], ["No feed found for thread\n"]];
+}
+
+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 = $cgi->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 {
 	my ($ctx, $cb) = @_;
-	my $max = $ctx->{max} || MAX_PER_PAGE;
+	my $max = $ctx->{-inbox}->{feedmax};
 	my $hex = '[a-f0-9]';
 	my $addmsg = qr!^:000000 100644 \S+ \S+ A\t(${hex}{2}/${hex}{38})$!;
 	my $delmsg = qr!^:100644 000000 \S+ \S+ D\t(${hex}{2}/${hex}{38})$!;
 	my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~\d+)?/;
-	my $cgi = $ctx->{cgi};
+	my $qp = $ctx->{qp};
 
 	# revision ranges may be specified
 	my $range = 'HEAD';
-	my $r = $cgi->param('r') if $cgi;
+	my $r = $qp->{r} if $qp;
 	if ($r && ($r =~ /\A(?:$refhex\.\.)?$refhex\z/o)) {
 		$range = $r;
 	}
@@ -214,8 +128,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);
@@ -224,11 +138,12 @@ sub each_recent_blob {
 	my $nr = 0;
 	my ($cur_commit, $first_commit, $last_commit);
 	my ($ts, $subj, $u);
+	local $/ = "\n";
 	while (defined(my $line = <$log>)) {
 		if ($line =~ /$addmsg/o) {
 			my $add = $1;
 			next if $deleted{$add}; # optimization-only
-			$nr += $cb->($add, $cur_commit, $ts, $u, $subj);
+			$cb->($add, $cur_commit, $ts, $u, $subj) and $nr++;
 			if ($nr >= $max) {
 				$last = 1;
 				last;
@@ -244,6 +159,7 @@ sub each_recent_blob {
 	}
 
 	if ($last) {
+		local $/ = "\n";
 		while (my $line = <$log>) {
 			if ($line =~ /^(${hex}{7,40})/o) {
 				$last_commit = $1;
@@ -256,108 +172,10 @@ sub each_recent_blob {
 	($first_commit, $last_commit);
 }
 
-# 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";
-		}
-	} else {
-		$url_base = 'http://example.com/';
-		$rv{atomurl} = $url_base.'new.atom';
-	}
-	$rv{url} ||= $url_base;
-	$rv{midurl} = $url_base;
-
-	\%rv;
-}
-
-sub feed_updated {
-	my ($date, $ts) = @_;
-	my @t = eval { strptime($date) } if defined $date;
-	@t = gmtime($ts || time) unless scalar @t;
-
-	'<updated>' . strftime(DATEFMT, @t) . '</updated>';
-}
-
-# returns 0 (skipped) or 1 (added)
-sub add_to_feed {
-	my ($feed_opts, $fh, $add, $git) = @_;
-
-	my $mime = do_cat_mail($git, $add) or return 0;
-	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;
-	$mid = PublicInbox::Hval->new_msgid($mid);
-	my $href = $mid->as_href;
-
-	my $content = qq(<pre\nstyle="white-space:pre-wrap">) .
-		PublicInbox::View::multipart_text_as_html($mime) .
-		'</pre>';
-	my $date = $header_obj->header('Date');
-	my $updated = feed_updated($date);
-
-	my $title = $header_obj->header('Subject');
-	defined $title or return 0;
-	$title = title_tag($title);
-
-	my $from = $header_obj->header('From') or return 0;
-	my @from = Email::Address->parse($from) or return 0;
-	my $name = ascii_html($from[0]->name);
-	my $email = $from[0]->address;
-	$email = ascii_html($email);
-
-	if (delete $feed_opts->{emit_header}) {
-		$fh->write(atom_header($feed_opts, $title) . $updated);
-	}
-	$fh->write("<entry><author><name>$name</name><email>$email</email>" .
-		   "</author>$title$updated" .
-		   qq{<content\ntype="xhtml">} .
-		   qq{<div\nxmlns="http://www.w3.org/1999/xhtml">});
-	$fh->write($content);
-
-	$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!</div></content><link\nhref="$midurl$href/"/>!.
-		   "<id>$id</id></entry>");
-	1;
-}
-
 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;
+	PublicInbox::MIME->new($mime);
 }
 
 1;