X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FFeed.pm;h=e4831f6a66a68d85691579eda43f6a6046e8fec5;hb=476fc666c223f0fb;hp=1201dd1165a03d3e0fc3ca3ed81b3dfe3bbf735f;hpb=f564327fd1e694056a4b13ed398cabd8d0d4c173;p=public-inbox.git diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 1201dd11..e4831f6a 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -8,8 +8,8 @@ use warnings; use Email::Address; use Email::MIME; use Date::Parse qw(strptime); -use PublicInbox::Hval; -use PublicInbox::GitCatFile; +use PublicInbox::Hval qw/ascii_html/; +use PublicInbox::Git; use PublicInbox::View; use PublicInbox::MID qw/mid_clean mid2path/; use POSIX qw/strftime/; @@ -18,9 +18,6 @@ use constant { MAX_PER_PAGE => 25, # this needs to be tunable }; -use Encode qw/find_encoding/; -my $enc_utf8 = find_encoding('UTF-8'); - # main function sub generate { my ($ctx) = @_; @@ -41,8 +38,9 @@ sub generate_html_index { sub title_tag { my ($title) = @_; + $title =~ tr/\t\n / /s; # squeeze spaces # try to avoid the type attribute in title: - $title = PublicInbox::Hval->new_oneline($title)->as_html; + $title =~ ascii_html($title); my $type = index($title, '&') >= 0 ? "\ntype=\"html\"" : ''; "
} } else { - $top = PublicInbox::View::PRE_WRAP . $top . "\n"; + $top = '' . $top . "\n"; } $fh->write("$title " . "" . + "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" . + PublicInbox::Hval::STYLE . "$top"); # if the 'r' query parameter is given, it is a legacy permalink @@ -167,7 +162,7 @@ sub emit_html_index { sub emit_index_nosrch { my ($ctx, $state, $fh) = @_; - my $git = PublicInbox::GitCatFile->new($ctx->{git_dir}); + my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir}); my (undef, $last) = each_recent_blob($ctx, sub { my ($path, $commit, $ts, $u, $subj) = @_; $state->{first} ||= $commit; @@ -196,7 +191,7 @@ sub nav_footer { $head = $cgi->path_info; $head = qq!head!; } - my $atom = "{atomurl}\">Atom"; + my $atom = "{atomurl}\">Atom feed"; "page: $next $head $atom"; } @@ -219,14 +214,11 @@ 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 @cmd = ('git', "--git-dir=$ctx->{git_dir}", - qw/log --no-notes --no-color --raw -r - --abbrev=16 --abbrev-commit/, - "--format=%h%x00%ct%x00%an%x00%s%x00"); - push @cmd, $range; - - my $pid = open(my $log, '-|', @cmd) or - die('open `'.join(' ', @cmd) . " pipe failed: $!\n"); + my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir}); + my $log = $git->popen(qw/log --no-notes --no-color --raw -r + --abbrev=16 --abbrev-commit/, + "--format=%h%x00%ct%x00%an%x00%s%x00", + $range); my %deleted; # only an optimization at this point my $last; my $nr = 0; @@ -260,7 +252,6 @@ sub each_recent_blob { } } - close $log; # we may EPIPE here # for pagination ($first_commit, $last_commit); } @@ -274,7 +265,6 @@ sub get_feedopts { my %rv; if (open my $fh, '<', "$ctx->{git_dir}/description") { chomp($rv{description} = <$fh>); - close $fh; } else { $rv{description} = '($GIT_DIR/description missing)'; } @@ -289,14 +279,7 @@ sub get_feedopts { my $url_base; if ($cgi) { - my $base; - if (ref($cgi) eq 'CGI') { - $base = $cgi->url(-base); - } else { - $base = $cgi->base->as_string; - $base =~ s!/\z!!; - } - $url_base = "$base/$listname"; + $url_base = $cgi->base->as_string . $listname; if (my $mid = $ctx->{mid}) { # per-thread feed: $rv{atomurl} = "$url_base/$mid/t.atom"; } else { @@ -312,11 +295,6 @@ sub get_feedopts { \%rv; } -sub mime_header { - my ($mime, $name) = @_; - PublicInbox::Hval->new_oneline($mime->header($name))->raw; -} - sub feed_updated { my ($date, $ts) = @_; my @t = eval { strptime($date) } if defined $date; @@ -334,7 +312,7 @@ sub add_to_feed { my $midurl = $feed_opts->{midurl}; my $header_obj = $mime->header_obj; - my $mid = $header_obj->header('Message-ID'); + my $mid = $header_obj->header_raw('Message-ID'); defined $mid or return 0; $mid = PublicInbox::Hval->new_msgid($mid); my $href = $mid->as_href; @@ -345,14 +323,15 @@ sub add_to_feed { my $date = $header_obj->header('Date'); my $updated = feed_updated($date); - my $title = mime_header($header_obj, 'Subject') or return 0; + my $title = $header_obj->header('Subject'); + defined $title or return 0; $title = title_tag($title); - my $from = mime_header($header_obj, 'From') or return 0; + my $from = $header_obj->header('From') or return 0; my @from = Email::Address->parse($from) or return 0; - my $name = PublicInbox::Hval->new_oneline($from[0]->name)->as_html; + my $name = ascii_html($from[0]->name); my $email = $from[0]->address; - $email = PublicInbox::Hval->new_oneline($email)->as_html; + $email = ascii_html($email); if (delete $feed_opts->{emit_header}) { $fh->write(atom_header($feed_opts, $title) . $updated);