From 7eee5ae1eb3650e4e963e60abf8543ac4aafb3c4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 28 Apr 2014 21:02:41 +0000 Subject: use relative URLs in HTML index Browsers know how to follow relative URLs, so we may generate smaller HTML pages. --- lib/PublicInbox/Feed.pm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'lib/PublicInbox/Feed.pm') diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index e593aace..d2bdea0d 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -73,12 +73,10 @@ sub generate_html_index { my $th = Mail::Thread->new(@messages); $th->thread; - my @out = ( - "$title" . + my $html = "$title" . '' . - '
');
-	push @out, $feed_opts->{midurl};
+		'
';
 
 	# sort by date, most recent at top
 	$th->order(sub {
@@ -87,11 +85,11 @@ sub generate_html_index {
 			$a->topmost->message->header('X-PI-Date')
 		} @_;
 	});
-	dump_html_line($_, 0, \@out) for $th->rootset;
+	dump_html_line($_, 0, \$html) for $th->rootset;
 
 	my $footer = nav_footer($args->{cgi}, $last);
 	$footer = "
$footer
" if $footer;
-	$out[0] . "
$footer";
+	$html . "
$footer"; } # private subs @@ -104,8 +102,7 @@ sub nav_footer { my $next = ' '; if ($last) { - $next = $cgi->path_info . "?r=$last"; - $next = qq!next!; + $next = qq!next!; } if ($old_r) { $head = $cgi->path_info; @@ -275,14 +272,14 @@ sub add_to_feed { } sub dump_html_line { - my ($self, $level, $args) = @_; # args => [ $html, $midurl ] + my ($self, $level, $html) = @_; if ($self->message) { - $args->[0] .= (' ' x $level); + $$html .= (' ' 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 $href = 'm/' . $mid->as_href . '.html'; my $from = mime_header($mime, 'From'); my @from = Email::Address->parse($from); @@ -291,10 +288,10 @@ sub dump_html_line { $from = PublicInbox::Hval->new_oneline($from)->as_html; $subj = PublicInbox::Hval->new_oneline($subj)->as_html; - $args->[0] .= "$subj $from\n"; + $$html .= "$subj $from\n"; } - dump_html_line($self->child, $level+1, $args) if $self->child; - dump_html_line($self->next, $level, $args) if $self->next; + dump_html_line($self->child, $level+1, $html) if $self->child; + dump_html_line($self->next, $level, $html) if $self->next; } sub try_git_pm { -- cgit v1.2.3-24-ge0c7