use strict;
use warnings;
use Email::Address;
-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
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
href => $feed_opts->{atomurl} ||
"http://example.com/atom.xml",
},
- id => $addr || 'public-inbox@example.com',
+ id => 'mailto:' . ($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;
});
$th->thread;
my @out = (
"<html><head><title>$title</title>" .
- '<link rel=alternate title=Atom.feed href="' .
+ '<link rel="alternate" title="Atom feed" href="' .
$feed_opts->{atomurl} . '" type="application/atom+xml"/>' .
'</head><body><pre>');
push @out, $feed_opts->{midurl};
my $old_r = $cgi->param('r');
my $prev = ' ';
my $next = ' ';
- my %opts = (-path => 1, -query => 1, -relative => 1);
if ($last) {
- $cgi->param('r', $last);
- $next = $cgi->url(%opts);
+ $next = $cgi->path_info . "?r=$last";
$next = qq!<a href="$next">next</a>!;
}
if ($first && $old_r) {
- $cgi->param('r', "$first..");
- $prev = $cgi->url(%opts);
+ $prev = $cgi->path_info . "?r=$first..";
$prev = qq!<a href="$prev">prev</a>!;
}
"$prev $next";
sub each_recent_blob {
my ($args, $cb) = @_;
my $max = $args->{max} || MAX_PER_PAGE;
- my $refhex = qr/[a-f0-9]{4,40}(?:~\d+)?/;
+ 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/${hex}{4,40}(?:~\d+)?/;
my $cgi = $args->{cgi};
# revision ranges may be specified
# 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 @cmd = qw/git log --no-notes --no-color --raw -r --no-abbrev/;
+ my @cmd = qw/git log --no-notes --no-color --raw -r/;
push @cmd, '--reverse' if $reverse;
push @cmd, $range;
my $first;
my $pid = open(my $log, '-|', @cmd) or
die('open `'.join(' ', @cmd) . " pipe failed: $!\n");
- my %deleted;
+ my %deleted; # only an optimization at this point
my $last;
my $nr = 0;
my @commits = ();
while (my $line = <$log>) {
- if ($line =~ /^:000000 100644 0{40} ([a-f0-9]{40})/) {
+ if ($line =~ /$addmsg/o) {
my $add = $1;
next if $deleted{$add};
$nr += $cb->($add);
$last = 1;
last;
}
- } elsif ($line =~ /^:100644 000000 ([a-f0-9]{40}) 0{40}/) {
+ } elsif ($line =~ /$delmsg/o) {
$deleted{$1} = 1;
- } elsif ($line =~ /^commit ([a-f0-9]{40})/) {
+ } elsif ($line =~ /^commit (${hex}{40})/) {
push @commits, $1;
}
}
if ($last) {
while (my $line = <$log>) {
- if ($line =~ /^commit ([a-f0-9]{40})/) {
+ if ($line =~ /^commit (${hex}{40})/) {
push @commits, $1;
last;
}
}
my $url_base;
if ($cgi) {
- my $cgi_url = $cgi->url(-path=>1, -relative=>1);
- my $base = $cgi->url(-base);
- $url_base = $cgi_url;
+ my $path_info = $cgi->path_info;
+ my $base;
+ if (ref($cgi) eq 'CGI') {
+ $base = $cgi->url(-base);
+ } else {
+ $base = "${$cgi->base}";
+ $base =~ s!/\z!!;
+ }
+ $url_base = $path_info;
if ($url_base =~ s!/(?:|index\.html)?\z!!) {
$rv{atomurl} = "$base$url_base/atom.xml";
} else {
$url_base =~ s!/atom\.xml\z!!;
- $rv{atomurl} = $base . $cgi_url;
+ $rv{atomurl} = $base . $path_info;
$url_base = $base . $url_base; # XXX is this needed?
}
} else {
\%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 $mid = $mime->header('Message-ID');
+ 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 $subject = utf8_header($mime, "Subject") || "";
- length($subject) or return 0;
-
- my $from = $mime->header('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 = "";
defined $email or $email = "";
my $date = $mime->header('Date');
- $date or return 0;
$date = PublicInbox::Hval->new_oneline($date);
- $date = feed_date($date->as_utf8) or return 0;
+ $date = feed_date($date->raw) or return 0;
+ $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 => "html", content => $content },
+ content => { type => 'xhtml', content => $content },
link => $midurl . $href,
- id => $add,
+ id => 'urn:uuid:' . join('-', @uuid5),
);
1;
}
my ($self, $level, $args) = @_; # args => [ $html, $midurl ]
if ($self->message) {
$args->[0] .= (' ' x $level);
- my $simple = $self->message;
- my $subj = $simple->header('Subject');
- my $mid = $simple->header('Message-ID');
+ 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 = utf8_header($simple, "From");
+ 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 = PublicInbox::Hval->new_oneline($subj);
- $subj = $subj->as_html;
+
+ $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";
}
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, $path) = @_;
my $str;
if ($git) {
open my $fh, '>', \$str or
die "failed to setup string handle: $!\n";
binmode $fh;
- my $bytes = $git->cat_blob($sha1, $fh);
+ my $err = '';
+ my $bytes;
+ {
+ local $SIG{__WARN__} = sub { $err .= $_[0] };
+ $bytes = $git->cat_blob("HEAD:$path", $fh);
+ }
close $fh or die "failed to close string handle: $!\n";
+
+ if ($bytes < 0 && $err &&
+ $err !~ /doesn't exist in the repository/) {
+ warn $err;
+ }
return if $bytes <= 0;
} else {
- $str = `git cat-file blob $sha1`;
+ $str = `git cat-file blob HEAD:$path`;
return if $? != 0 || length($str) == 0;
}
- $class->new($str);
+ Email::MIME->new($str);
}
1;