From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/3] feed: split out top-of-page generation
Date: Sat, 18 Jun 2016 04:47:03 +0000 [thread overview]
Message-ID: <20160618044705.8337-2-e@80x24.org> (raw)
In-Reply-To: <20160618044705.8337-1-e@80x24.org>
This will eventually allow us to reuse code to generate a common
header.
---
lib/PublicInbox/Feed.pm | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 07774cb..045e495 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -109,20 +109,11 @@ sub emit_atom_thread {
end_feed($fh);
}
-sub emit_html_index {
- my ($res, $ctx) = @_;
- my $feed_opts = get_feedopts($ctx);
- my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
-
- my $max = $ctx->{max} || MAX_PER_PAGE;
+sub _html_index_top {
+ my ($feed_opts, $srch) = @_;
my $title = ascii_html($feed_opts->{description} || '');
- my ($footer, $param, $last);
- my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
- my $srch = $ctx->{srch};
-
my $top = "<b>$title</b> (<a\nhref=\"new.atom\">Atom feed</a>)";
-
if ($srch) {
$top = qq{<form\naction=""><pre>$top} .
qq{ <input\nname=q\ntype=text />} .
@@ -132,11 +123,24 @@ sub emit_html_index {
$top = '<pre>' . $top . "\n";
}
- $fh->write("<html><head><title>$title</title>" .
- "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
- "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
- PublicInbox::Hval::STYLE .
- "</head><body>$top");
+ "<html><head><title>$title</title>" .
+ "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
+ "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
+ PublicInbox::Hval::STYLE .
+ "</head><body>$top";
+}
+
+sub emit_html_index {
+ my ($res, $ctx) = @_;
+ my $feed_opts = get_feedopts($ctx);
+ my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
+
+ my $max = $ctx->{max} || MAX_PER_PAGE;
+
+ my ($footer, $param, $last);
+ my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
+ my $srch = $ctx->{srch};
+ $fh->write(_html_index_top($feed_opts, $srch));
# if the 'r' query parameter is given, it is a legacy permalink
# which we must continue supporting:
next prev parent reply other threads:[~2016-06-18 4:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-18 4:47 [PATCH 0/3] introduce WwwStream for per-message views Eric Wong
2016-06-18 4:47 ` Eric Wong [this message]
2016-06-18 4:47 ` [PATCH 2/3] view: introduce WwwStream interface Eric Wong
2016-06-18 4:47 ` [PATCH 3/3] view: minor tweaks to reduce long lines Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160618044705.8337-2-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).