use strict;
use warnings;
use Email::Address;
-use URI::Escape qw/uri_escape/;
-use Encode qw/find_encoding/;
-use Encode::MIME::Header;
-use CGI qw(escapeHTML);
+use Email::MIME;
use Date::Parse qw(strptime str2time);
+use PublicInbox::Hval;
eval { require Git }; # this is GPLv2+, so we are OK to use it
use constant {
DATEFMT => '%Y-%m-%dT%H:%M:%SZ',
MAX_PER_PAGE => 25,
};
-my $enc_utf8 = find_encoding('utf8');
-my $enc_ascii = find_encoding('us-ascii');
-my $enc_mime = find_encoding('MIME-Header');
# FIXME: workaround https://rt.cpan.org/Public/Bug/Display.html?id=22817
my ($class, $args) = @_;
require XML::Atom::SimpleFeed;
require PublicInbox::View;
- require Email::MIME;
require POSIX;
my $max = $args->{max} || MAX_PER_PAGE;
my $top = $args->{top}; # bool
local $ENV{GIT_DIR} = $args->{git_dir};
my $feed_opts = get_feedopts($args);
-
+ 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",
+ "http://example.com/atom.xml",
},
- id => $feed_opts->{address} || 'public-inbox@example.com',
+ id => $addr || 'public-inbox@example.com',
updated => POSIX::strftime(DATEFMT, gmtime),
);
my $top = $args->{top}; # bool
local $ENV{GIT_DIR} = $args->{git_dir};
my $feed_opts = get_feedopts($args);
- my $title = xs_html($feed_opts->{description} || "");
+
+ my $title = $feed_opts->{description} || '';
+ $title = PublicInbox::Hval->new_oneline($title)->as_html;
+
my @messages;
my $git = try_git_pm($args->{git_dir});
my ($first, $last) = each_recent_blob($args, sub {
- my $simple = do_cat_mail($git, 'Email::Simple', $_[0])
+ my $mime = do_cat_mail($git, $_[0])
or return 0;
- if ($top && ($simple->header("In-Reply-To") ||
- $simple->header("References"))) {
+ if ($top && ($mime->header('In-Reply-To') ||
+ $mime->header('References'))) {
return 0;
}
- $simple->body_set(""); # save some memory
+ $mime->body_set(''); # save some memory
- my $t = eval { str2time($simple->header('Date')) };
+ my $t = eval { str2time($mime->header('Date')) };
defined($t) or $t = 0;
- $simple->header_set('X-PI-Date', $t);
- push @messages, $simple;
+ $mime->header_set('X-PI-Date', $t);
+ push @messages, $mime;
1;
});
last;
}
}
+ } elsif ($reverse) {
+ unshift @commits, undef
+ } else {
+ push @commits, undef;
}
close $log; # we may EPIPE here
my $listname = $args->{listname};
my $cgi = $args->{cgi};
my %rv;
+ if (open my $fh, '<', "$args->{git_dir}/description") {
+ chomp($rv{description} = <$fh>);
+ close $fh;
+ }
if ($pi_config && defined $listname && length $listname) {
- foreach my $key (qw(description address)) {
+ foreach my $key (qw(address)) {
$rv{$key} = $pi_config->get($listname, $key) || "";
}
}
my $base = $cgi->url(-base);
$url_base = $cgi_url;
if ($url_base =~ s!/(?:|index\.html)?\z!!) {
- $rv{atomurl} = "$base$url_base/index.atom.xml";
+ $rv{atomurl} = "$base$url_base/atom.xml";
} else {
- $url_base =~ s!/?(?:index|all)\.atom\.xml\z!!;
+ $url_base =~ s!/atom\.xml\z!!;
$rv{atomurl} = $base . $cgi_url;
$url_base = $base . $url_base; # XXX is this needed?
}
} else {
$url_base = "http://example.com";
- $rv{atomurl} = "$url_base/index.atom.xml";
+ $rv{atomurl} = "$url_base/atom.xml";
}
$rv{url} ||= "$url_base/";
$rv{midurl} = "$url_base/m/";
\%rv;
}
-sub utf8_header {
- my ($simple, $name) = @_;
- my $val = $simple->header($name);
- return "" unless defined $val;
- $val =~ tr/\t\n / /s;
- $val =~ tr/\r//d;
- $enc_utf8->encode($enc_mime->decode($val));
+sub mime_header {
+ my ($mime, $name) = @_;
+ PublicInbox::Hval->new_oneline($mime->header($name))->raw;
}
sub feed_date {
sub add_to_feed {
my ($feed_opts, $feed, $add, $top, $git) = @_;
- my $mime = do_cat_mail($git, 'Email::MIME', $add) or return 0;
- if ($top && $mime->header("In-Reply-To")) {
+ my $mime = do_cat_mail($git, $add) or return 0;
+ if ($top && $mime->header('In-Reply-To')) {
return 0;
}
my $midurl = $feed_opts->{midurl} || 'http://example.com/m/';
my $fullurl = $feed_opts->{fullurl} || 'http://example.com/f/';
- my $content = PublicInbox::View->as_feed_entry($mime, $fullurl);
+ my $mid = $mime->header_obj->header_raw('Message-ID');
+ defined $mid or return 0;
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $href = $mid->as_href;
+ my $content = PublicInbox::View->as_feed_entry($mime,
+ "$fullurl$href.html");
defined($content) or return 0;
- my $mid = utf8_header($mime, "Message-ID") or return 0;
- $mid =~ s/\A<//; $mid =~ s/>\z//;
-
- my $subject = utf8_header($mime, "Subject") || "";
- length($subject) or return 0;
-
- my $from = utf8_header($mime, "From") or return 0;
+ my $subject = mime_header($mime, 'Subject') or return 0;
+ my $from = mime_header($mime, 'From') or return 0;
my @from = Email::Address->parse($from);
my $name = $from[0]->name;
defined $name or $name = "";
my $email = $from[0]->address;
defined $email or $email = "";
- my $url = $midurl . uri_escape($mid);
- my $date = utf8_header($mime, "Date");
- $date or return 0;
- $date = feed_date($date) or return 0;
+ my $date = $mime->header('Date');
+ $date = PublicInbox::Hval->new_oneline($date);
+ $date = feed_date($date->raw) or return 0;
$feed->add_entry(
author => { name => $name, email => $email },
title => $subject,
updated => $date,
content => { type => "html", content => $content },
- link => $url,
+ link => $midurl . $href,
id => $add,
);
1;
sub dump_html_line {
my ($self, $level, $args) = @_; # args => [ $html, $midurl ]
- $args->[0] .= (' ' x $level);
if ($self->message) {
- my $simple = $self->message;
- my $subj = utf8_header($simple, "Subject");
- my $mid = utf8_header($simple, "Message-ID");
- $mid =~ s/\A<//;
- $mid =~ s/>\z//;
- my $url = $args->[1] . uri_escape($mid);
- my $from = utf8_header($simple, "From");
+ $args->[0] .= (' ' x $level);
+ my $mime = $self->message;
+ my $subj = $mime->header('Subject');
+ my $mid = $mime->header_obj->header_raw('Message-ID');
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $url = $args->[1] . $mid->as_href;
+ my $from = mime_header($mime, 'From');
+
my @from = Email::Address->parse($from);
$from = $from[0]->name;
(defined($from) && length($from)) or $from = $from[0]->address;
- $from = xs_html($from);
- $subj = xs_html($subj);
+
+ $from = PublicInbox::Hval->new_oneline($from)->as_html;
+ $subj = PublicInbox::Hval->new_oneline($subj)->as_html;
$args->[0] .= "<a href=\"$url.html\">$subj</a> $from\n";
- } else {
- $args->[0] .= "[ Message not available ]\n";
}
dump_html_line($self->child, $level+1, $args) if $self->child;
dump_html_line($self->next, $level, $args) if $self->next;
}
-sub xs_html {
- $enc_ascii->encode(escapeHTML($enc_utf8->decode($_[0])),
- Encode::HTMLCREF);
-}
-
sub try_git_pm {
my ($dir) = @_;
eval { Git->repository(Directory => $dir) };
};
sub do_cat_mail {
- my ($git, $class, $sha1) = @_;
+ my ($git, $sha1) = @_;
my $str;
if ($git) {
open my $fh, '>', \$str or
$str = `git cat-file blob $sha1`;
return if $? != 0 || length($str) == 0;
}
- $class->new($str);
+ Email::MIME->new($str);
}
1;