-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015, all contributors <meta@public-inbox.org>
# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
package PublicInbox::Feed;
use strict;
# main function
sub generate {
- my ($class, $ctx) = @_;
- require XML::Atom::SimpleFeed;
+ my ($ctx) = @_;
+ sub { emit_atom($_[0], $ctx) };
+}
+
+sub generate_html_index {
+ my ($ctx) = @_;
+ sub { emit_html_index($_[0], $ctx) };
+}
+
+# private subs
+
+sub emit_atom {
+ my ($cb, $ctx) = @_;
require POSIX;
+ my $fh = $cb->([ 200, ['Content-Type' => 'application/xml']]);
my $max = $ctx->{max} || MAX_PER_PAGE;
-
my $feed_opts = get_feedopts($ctx);
my $addr = $feed_opts->{address};
$addr = $addr->[0] if ref($addr);
- my $feed = XML::Atom::SimpleFeed->new(
- title => $feed_opts->{description} || "unnamed feed",
- link => $feed_opts->{url} || "http://example.com/",
- link => {
- rel => 'self',
- href => $feed_opts->{atomurl} ||
- "http://example.com/atom.xml",
- },
- id => 'mailto:' . ($addr || 'public-inbox@example.com'),
- updated => POSIX::strftime(DATEFMT, gmtime),
- );
- $feed->no_generator;
+ $addr ||= 'public-inbox@example.com';
+ my $title = $feed_opts->{description} || "unnamed feed";
+ $title = PublicInbox::Hval->new_oneline($title)->as_html;
+ my $type = index($title, '&') >= 0 ? "\ntype=\"html\"" : '';
+ my $url = $feed_opts->{url} || "http://example.com/";
+ my $atomurl = $feed_opts->{atomurl};
+ $fh->write(qq(<?xml version="1.0" encoding="us-ascii"?>\n) .
+ qq{<feed\nxmlns="http://www.w3.org/2005/Atom">} .
+ qq{<title$type>$title</title>} .
+ qq{<link\nhref="$url"/>} .
+ qq{<link\nrel="self"\nhref="$atomurl"/>} .
+ qq{<id>mailto:$addr</id>} .
+ '<updated>' . POSIX::strftime(DATEFMT, gmtime) . '</updated>');
my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
each_recent_blob($ctx, sub {
my ($add, undef) = @_;
- add_to_feed($feed_opts, $feed, $add, $git);
+ add_to_feed($feed_opts, $fh, $add, $git);
});
$git = undef; # destroy pipes
Email::Address->purge_cache;
- $feed->as_string;
+ $fh->write("</feed>");
+ $fh->close;
}
-sub generate_html_index {
- my ($class, $ctx) = @_;
+
+sub emit_html_index {
+ my ($cb, $ctx) = @_;
+ my $fh = $cb->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
my $max = $ctx->{max} || MAX_PER_PAGE;
my $feed_opts = get_feedopts($ctx);
$title = PublicInbox::Hval->new_oneline($title)->as_html;
my $atom_url = $feed_opts->{atomurl};
- my $html = "<html><head><title>$title</title>" .
- "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
- "href=\"$atom_url\"\"\ntype=\"application/atom+xml\"/>" .
- '</head><body>' . PublicInbox::View::PRE_WRAP;
+ $fh->write("<html><head><title>$title</title>" .
+ "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
+ "href=\"$atom_url\"\ntype=\"application/atom+xml\"/>" .
+ '</head><body>' . PublicInbox::View::PRE_WRAP .
+ "<b>$title</b> (<a\nhref=\"$atom_url\">Atom feed</a>)\n");
my $state;
my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
add_topic($git, $srch, $topics, $path, $ts, $u, $subj);
} else {
my $mime = do_cat_mail($git, $path) or return 0;
- $html .=
- PublicInbox::View->index_entry($mime, 0, $state);
+ PublicInbox::View::index_entry($fh, $mime, 0, $state);
1;
}
});
$footer .= "\n" . $list_footer if $list_footer;
$footer = "<hr /><pre>$footer</pre>";
}
- dump_topics(\$html, $topics) if $topics;
- $html .= "$footer</body></html>";
+ $fh->write(dump_topics($topics)) if $topics;
+ $fh->write("$footer</body></html>");
+ $fh->close;
}
-# private subs
-
sub nav_footer {
my ($cgi, $last, $feed_opts, $state) = @_;
$cgi or return '';
# returns 0 (skipped) or 1 (added)
sub add_to_feed {
- my ($feed_opts, $feed, $add, $git) = @_;
+ my ($feed_opts, $fh, $add, $git) = @_;
my $mime = do_cat_mail($git, $add) or return 0;
- my $midurl = $feed_opts->{midurl} || 'http://example.com/m/';
my $fullurl = $feed_opts->{fullurl} || 'http://example.com/f/';
my $header_obj = $mime->header_obj;
- my $mid = $header_obj->header_raw('Message-ID');
+ my $mid = $header_obj->header('Message-ID');
defined $mid or return 0;
$mid = PublicInbox::Hval->new_msgid($mid);
my $href = $mid->as_href . '.html';
defined($content) or return 0;
$mime = undef;
- my $subject = mime_header($header_obj, 'Subject') or return 0;
+ my $title = mime_header($header_obj, 'Subject') or return 0;
+ $title = PublicInbox::Hval->new_oneline($title)->as_html;
+ my $type = index($title, '&') >= 0 ? "\ntype=\"html\"" : '';
my $from = mime_header($header_obj, 'From') or return 0;
my @from = Email::Address->parse($from);
- my $name = $from[0]->name;
- defined $name or $name = "";
+ my $name = PublicInbox::Hval->new_oneline($from[0]->name)->as_html;
my $email = $from[0]->address;
- defined $email or $email = "";
+ $email = PublicInbox::Hval->new_oneline($email)->as_html;
my $date = $header_obj->header('Date');
$date = PublicInbox::Hval->new_oneline($date);
$date = feed_date($date->raw) or return 0;
+
+ $fh->write("<entry><author><name>$name</name><email>$email</email>" .
+ "</author><title$type>$title</title>" .
+ "<updated>$date</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);
-
- $feed->add_entry(
- author => { name => $name, email => $email },
- title => $subject,
- updated => $date,
- content => { type => 'xhtml', content => $content },
- link => $midurl . $href,
- id => 'urn:uuid:' . join('-', @uuid5),
- );
+ my $id = 'urn:uuid:' . join('-', @uuid5);
+ my $midurl = $feed_opts->{midurl} || 'http://example.com/m/';
+ $fh->write(qq{</div></content><link\nhref="$midurl$href"/>}.
+ "<id>$id</id></entry>");
1;
}
my $mime = do_cat_mail($git, $path) or return 0;
$header_obj = $mime->header_obj;
}
- my $mid = $header_obj->header_raw('Message-ID');
+ my $mid = $header_obj->header('Message-ID');
$mid = mid_compressed(mid_clean($mid));
$u = $enc_utf8->decode($u);
push @$order, [ $mid, $ts, $u, $subj ];
}
sub dump_topics {
- my ($dst, $topics) = @_;
+ my ($topics) = @_;
my ($order, $subjs) = @$topics;
- $$dst .= '[No recent topics]' unless (scalar @$order);
+ my $dst = '';
+ $dst .= "\n[No recent topics]" unless (scalar @$order);
while (defined(my $info = shift @$order)) {
my ($mid, $ts, $u, $subj) = @$info;
my $n = delete $subjs->{$subj};
$mid = PublicInbox::Hval->new($mid)->as_href;
$subj = PublicInbox::Hval->new($subj)->as_html;
$u = PublicInbox::Hval->new($u)->as_html;
- $
$dst .= "<a\nhref=\"t/$mid.html#u\"><b>$subj</b></a>\n- ";
+ $
dst .= "\n<a\nhref=\"t/$mid.html#u\"><b>$subj</b></a>\n- ";
$ts = POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
if ($n == 1) {
- $$dst .= "created by $u @ $ts UTC\n"
+ $dst .= "created by $u @ $ts UTC\n"
} else {
# $n isn't the total number of posts on the topic,
# just the number of posts in the current "git log"
# window, so leave it unlabeled
- $$dst .= "updated by $u @ $ts UTC ($n)\n"
+ $dst .= "updated by $u @ $ts UTC ($n)\n"
}
}
- $$dst .= '</pre>'
+ $dst .= '</pre>'
}
1;