diff options
| -rw-r--r-- | lib/PublicInbox/Feed.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/View.pm | 40 | ||||
| -rw-r--r-- | lib/PublicInbox/WWW.pm | 7 | ||||
| -rw-r--r-- | t/cgi.t | 28 | ||||
| -rw-r--r-- | t/feed.t | 2 | ||||
| -rw-r--r-- | t/plack.t | 4 | ||||
| -rw-r--r-- | t/view.t | 7 |
7 files changed, 48 insertions, 44 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index d34978c1..9e567476 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -273,7 +273,7 @@ sub add_to_feed { my $mid = $header_obj->header('Message-ID'); defined $mid or return 0; $mid = PublicInbox::Hval->new_msgid($mid); - my $href = $mid->as_href . '.html'; + my $href = $mid->as_href . '/'; my $content = PublicInbox::View->feed_entry($mime, $fullurl . $href); defined($content) or return 0; $mime = undef; @@ -362,7 +362,7 @@ sub dump_topics { $mid = PublicInbox::Hval->new($mid)->as_href; $subj = PublicInbox::Hval->new($subj)->as_html; $u = PublicInbox::Hval->new($u)->as_html; - $dst .= "\n<a\nhref=\"t/$mid.html#u\"><b>$subj</b></a>\n- "; + $dst .= "\n<a\nhref=\"t/$mid/#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" diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 7412ccf9..8ccdcfaf 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -72,7 +72,7 @@ sub index_entry { $subj = PublicInbox::Hval->new_oneline($subj)->as_html; my $more = 'permalink'; my $root_anchor = $state->{root_anchor}; - my $path = $root_anchor ? '../' : ''; + my $path = $root_anchor ? '../../' : ''; my $href = $mid->as_href; my $irt = $header_obj->header('In-Reply-To'); my ($anchor_idx, $anchor, $t_anchor); @@ -84,7 +84,7 @@ sub index_entry { $t_anchor = ''; } if ($srch) { - $subj = "<a\nhref=\"${path}t/$href.html#u\">$subj</a>"; + $subj = "<a\nhref=\"${path}t/$href/#u\">$subj</a>"; } if ($root_anchor && $root_anchor eq $id) { $subj = "<u\nid=\"u\">$subj</u>"; @@ -110,9 +110,9 @@ sub index_entry { $fh->write($rv .= "\n\n"); my ($fhref, $more_ref); - my $mhref = "${path}m/$href.html"; + my $mhref = "${path}m/$href/"; if ($level > 0) { - $fhref = "${path}f/$href.html"; + $fhref = "${path}f/$href/"; $more_ref = \$more; } # scan through all parts, looking for displayable text @@ -121,7 +121,7 @@ sub index_entry { }); $mime->body_set(''); - my $txt = "${path}m/$href.txt"; + my $txt = "${path}m/$href/raw"; $rv = "\n<a\nhref=\"$mhref\">$more</a> <a\nhref=\"$txt\">raw</a> "; $rv .= html_footer($mime, 0, undef, $ctx); @@ -129,14 +129,14 @@ sub index_entry { unless (defined $anchor) { my $v = PublicInbox::Hval->new_msgid($irt); $v = $v->as_href; - $anchor = "${path}m/$v.html"; + $anchor = "${path}m/$v/"; $seen->{$anchor_idx} = $anchor; } $rv .= " <a\nhref=\"$anchor\">parent</a>"; } if ($srch) { - $rv .= " <a\nhref=\"${path}t/$href.html$t_anchor\">" . + $rv .= " <a\nhref=\"${path}t/$href/$t_anchor\">" . "threadlink</a>"; } @@ -173,9 +173,9 @@ sub emit_thread_html { my $final_anchor = $state->{anchor_idx}; my $next = "<a\nid=\"s$final_anchor\">"; $next .= $final_anchor == 1 ? 'only message in' : 'end of'; - $next .= " thread</a>, back to <a\nhref=\"../\">index</a>\n"; - $mid = PublicInbox::Hval->new_msgid($mid)->as_href; - $next .= "download: <a\nhref=\"$mid.mbox.gz\">mbox.gz</a>\n\n"; + $next .= " thread</a>, back to <a\nhref=\"../../\">index</a>\n"; + # $mid = PublicInbox::Hval->new_msgid($mid)->as_href; + $next .= "download: <a\nhref=\"mbox.gz\">mbox.gz</a>\n\n"; $fh->write("<hr />" . PRE_WRAP . $next . $foot . "</pre></body></html>"); $fh->close; @@ -361,7 +361,7 @@ sub headers_to_html_header { } elsif ($h eq 'Subject') { $title[0] = $v->as_html; if ($srch) { - $rv .= "$h: <a\nhref=\"../t/$mid_href.html\">"; + $rv .= "$h: <a\nhref=\"../../t/$mid_href/\">"; $rv .= $v->as_html . "</a>\n"; next; } @@ -371,8 +371,8 @@ sub headers_to_html_header { } $rv .= 'Message-ID: <' . $mid->as_html . '> '; - $mid_href = "../m/$mid_href" unless $full_pfx; - $rv .= "(<a\nhref=\"$mid_href.txt\">raw</a>)\n"; + my $raw_ref = $full_pfx ? 'raw' : "../../m/$mid_href/raw"; + $rv .= "(<a\nhref=\"$raw_ref\">raw</a>)\n"; my $irt = $header_obj->header('In-Reply-To'); if (defined $irt) { @@ -380,7 +380,7 @@ sub headers_to_html_header { my $html = $v->as_html; my $href = $v->as_href; $rv .= "In-Reply-To: <"; - $rv .= "<a\nhref=\"$href.html\">$html</a>>\n"; + $rv .= "<a\nhref=\"../$href/\">$html</a>>\n"; } my $refs = $header_obj->header('References'); @@ -437,12 +437,12 @@ sub html_footer { my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj"; my $srch = $ctx->{srch} if $ctx; - my $idx = $standalone ? " <a\nhref=\"../\">index</a>" : ''; + my $idx = $standalone ? " <a\nhref=\"../../\">index</a>" : ''; if ($idx && $srch) { $irt = $mime->header('In-Reply-To') || ''; $mid = mid_compress(mid_clean($mid)); my $t_anchor = length $irt ? T_ANCHOR : ''; - $idx = " <a\nhref=\"../t/$mid.html$t_anchor\">". + $idx = " <a\nhref=\"../../t/$mid/$t_anchor\">". "threadlink</a>$idx"; my $res = $srch->get_followups($mid); if (my $c = $res->{total}) { @@ -461,7 +461,7 @@ sub html_footer { if ($irt) { $irt = PublicInbox::Hval->new_msgid($irt); $irt = $irt->as_href; - $irt = "<a\nhref=\"$irt\">parent</a> "; + $irt = "<a\nhref=\"../$irt/\">parent</a> "; } else { $irt = ' ' x length('parent '); } @@ -476,7 +476,7 @@ sub linkify_ref { my $v = PublicInbox::Hval->new_msgid($_[0]); my $html = $v->as_html; my $href = $v->as_href; - "<<a\nhref=\"$href.html\">$html</a>>"; + "<<a\nhref=\"../$href/\">$html</a>>"; } sub anchor_for { @@ -511,7 +511,7 @@ sub simple_dump { my $m = PublicInbox::Hval->new_msgid($mid); $f = PublicInbox::Hval->new($f); $d = PublicInbox::Hval->new($d); - $m = $m->as_href . '.html'; + $m = $m->as_href . '/'; $f = $f->as_html; $d = $d->as_html . ' UTC'; if (length($s) == 0) { @@ -592,7 +592,7 @@ sub missing_thread { my $title = 'Thread does not exist'; $cb->([404, ['Content-Type' => 'text/html']])->write(<<EOF); <html><head><title>$title</title></head><body><pre>$title -<a href="../">Return to index</a></pre></body></html> +<a href="../../">Return to index</a></pre></body></html> EOF } diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index ca338fb4..ceb34d67 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -56,6 +56,9 @@ sub run { invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx); # thread display + } elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)/\z!o) { + invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx); + } elsif ($path_info =~ m!$LISTNAME_RE/t/(\S+)\.html\z!o) { invalid_list_mid(\%ctx, $1, $2) || get_thread(\%ctx); @@ -220,7 +223,7 @@ sub redirect_mid { if (lc($pfx) eq 't') { $anchor = '#u'; # <u id='#u'> is used to highlight in View.pm } - do_redirect($url . ".html$anchor"); + do_redirect($url . "/$anchor"); } # only hit when somebody tries to guess URLs manually: @@ -329,7 +332,7 @@ EOF sub msg_pfx { my ($ctx) = @_; my $href = PublicInbox::Hval::ascii_html(uri_escape_utf8($ctx->{mid})); - "../f/$href.html"; + "../../f/$href/"; } # /$LISTNAME/t/$MESSAGE_ID/mbox -> thread as mbox @@ -152,27 +152,27 @@ EOF } local $ENV{GIT_DIR} = $maindir; - my $res = cgi_run("/test/m/slashy%2fasdf%40example.com.txt"); + my $res = cgi_run("/test/m/slashy%2fasdf%40example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, - "slashy mid.txt hit"); + "slashy mid raw hit"); - $res = cgi_run("/test/m/blahblah\@example.com.txt"); + $res = cgi_run("/test/m/blahblah\@example.com/raw"); like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/, - "mid.txt hit"); - $res = cgi_run("/test/m/blahblah\@example.con.txt"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.txt miss"); + "mid raw hit"); + $res = cgi_run("/test/m/blahblah\@example.con/raw"); + like($res->{head}, qr/Status: 404 Not Found/, "mid raw miss"); - $res = cgi_run("/test/m/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $res = cgi_run("/test/m/blahblah\@example.com/"); + like($res->{body}, qr/\A<html>/, "mid html hit"); like($res->{head}, qr/Status: 200 OK/, "200 response"); - $res = cgi_run("/test/m/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $res = cgi_run("/test/m/blahblah\@example.con/"); + like($res->{head}, qr/Status: 404 Not Found/, "mid html miss"); - $res = cgi_run("/test/f/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $res = cgi_run("/test/f/blahblah\@example.com/"); + like($res->{body}, qr/\A<html>/, "mid html"); like($res->{head}, qr/Status: 200 OK/, "200 response"); - $res = cgi_run("/test/f/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $res = cgi_run("/test/f/blahblah\@example.con/"); + like($res->{head}, qr/Status: 404 Not Found/, "mid html miss"); $res = cgi_run("/test/"); like($res->{body}, qr/slashy%2Fasdf%40example\.com/, @@ -77,7 +77,7 @@ EOF } unlike($feed, qr/drop me/, "long quoted text dropped"); - like($feed, qr!/f/\d%40example\.com\.html\b!, + like($feed, qr!/f/\d%40example\.com/#q!, "/f/ url generated for long quoted text"); like($feed, qr/inline me here/, "short quoted text kept"); like($feed, qr/keep me/, "unquoted text saved"); @@ -88,7 +88,7 @@ EOF is(200, $res->code, 'success response received'); like($res->content, qr!href="\Q$atomurl\E"!, 'atom URL generated'); - like($res->content, qr!href="m/blah%40example\.com\.html"!, + like($res->content, qr!href="m/blah%40example\.com/"!, 'index generated'); }); @@ -98,7 +98,7 @@ EOF my $res = $cb->(GET($pfx . '/atom.xml')); is(200, $res->code, 'success response received for atom'); like($res->content, - qr!link\s+href="\Q$pfx\E/m/blah%40example\.com\.html"!s, + qr!link\s+href="\Q$pfx\E/m/blah%40example\.com/"!s, 'atom feed generated correct URL'); }); @@ -44,17 +44,18 @@ EOF my $html = PublicInbox::View::msg_html(undef, $mime); # ghetto tests - like($html, qr!<a\nhref="\.\./m/hello%40!s, "MID link present"); + like($html, qr!<a\nhref="\.\./\.\./m/hello%40!s, "MID link present"); like($html, qr/hello world\b/, "body present"); like($html, qr/> keep this inline/, "short quoted text is inline"); like($html, qr/<a\nid=[^>]+><\/a>> Long and wordy/, "long quoted text is anchored"); # short page - my $pfx = "http://example.com/test/f"; + my $pfx = "../../f/hello%40example.com/"; $mime = Email::MIME->new($s); my $short = PublicInbox::View::msg_html(undef, $mime, $pfx); - like($short, qr!<a\nhref="hello%40!s, "MID link present"); + like($short, qr!<a\nhref="\.\./\.\./f/hello%40example\.com/!s, + "MID link present"); like($short, qr/\n> keep this inline/, "short quoted text is inline"); like($short, qr/<a\nhref="\Q$pfx\E#[^>]+>Long and wordy/, |