From: tim.nordell at logicpd.com (Tim Nordell)
Subject: [PATCH v2 5/8] ui-repolist: Factor out logic for emitting a new section heading
Date: Fri, 4 Mar 2016 17:29:34 -0600 [thread overview]
Message-ID: <1457134177-4094-1-git-send-email-tim.nordell@logicpd.com> (raw)
In-Reply-To: <1457133901-12998-1-git-send-email-tim.nordell@logicpd.com>
For a later commit in this series, this logic is common in a couple
of places. This simplifies the logic a bit instead of having several
nested checks. Additionally, this patch removes the need for using
"!strcmp(c->section, "")" as this is equivalent to comparing
"'\0' == repo->section[0]".
Signed-off-by: Tim Nordell <tim.nordell at logicpd.com>
diff --git a/ui-repolist.c b/ui-repolist.c
index 38a42c7..df2dc92 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -329,6 +329,30 @@ static void html_repository(struct cgit_repo *repo, bool sorted)
html("</tr>\n");
}
+static inline bool should_emit_section(struct repolist_ctx *c, struct cgit_repo *repo)
+{
+ /* If we're sorted, we will not have a new section emitted. */
+ if (c->sorted)
+ return false;
+
+ /* We need a valid repo section for the rest of the checks */
+ if (NULL == repo->section)
+ return false;
+
+ /* If the section title is blank (e.g. top-level), we never emit
+ * a section heading. */
+ if ('\0' == repo->section[0])
+ return false;
+
+ /* Finally, compare the last section name to the current. If they're
+ * the same, do not emit a section area. */
+ if (NULL != c->last_section && !strcmp(repo->section, c->last_section))
+ return false;
+
+ c->last_section = repo->section;
+ return true;
+}
+
void cgit_print_repolist(void)
{
struct repolist_ctx repolist_ctx;
@@ -375,16 +399,8 @@ void cgit_print_repolist(void)
if (c->hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
continue;
c->section = ctx.repo->section;
- if (c->section && !strcmp(c->section, ""))
- c->section = NULL;
- if (!c->sorted &&
- ((c->last_section == NULL && c->section != NULL) ||
- (repolist_ctx.last_section != NULL && c->section == NULL) ||
- (repolist_ctx.last_section != NULL && c->section != NULL &&
- strcmp(c->section, c->last_section)))) {
+ if (should_emit_section(&repolist_ctx, ctx.repo))
html_section(ctx.repo, c->columns);
- c->last_section = c->section;
- }
html_repository(ctx.repo, repolist_ctx.sorted);
}
html("</table>");
--
2.4.9
next prev parent reply other threads:[~2016-03-04 23:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 20:58 [PATCH 0/3] ui-repolist: Support additional formatting for sections tim.nordell
2016-02-26 20:58 ` [PATCH 1/3] ui-repolist: Add section filter tim.nordell
2016-02-28 12:51 ` john
2016-02-26 20:58 ` [PATCH 2/3] ui-repolist: Restructure internal logic to be more extensible tim.nordell
2016-02-28 13:02 ` john
2016-02-29 20:51 ` tim.nordell
2016-02-26 20:58 ` [PATCH 3/3] ui-repolist: Support a trimmed view when several sections are present tim.nordell
2016-03-04 23:24 ` [PATCH v2 0/8] ui-repolist: Support additional formatting for sections tim.nordell
2016-03-04 23:24 ` [PATCH v2 1/8] ui-repolist: Add section filter tim.nordell
2016-03-04 23:24 ` [PATCH v2 2/8] ui-repolist: Remove conditional around print_header() tim.nordell
2016-03-04 23:24 ` [PATCH v2 3/8] ui-repolist: Create context structure for cgit_print_repolist() tim.nordell
2016-03-04 23:24 ` [PATCH v2 4/8] ui-repolist: Move HTML generation into helper functions tim.nordell
2016-03-04 23:29 ` tim.nordell [this message]
2016-03-04 23:30 ` [PATCH v2 6/8] ui-repolist: Remove assignment of section to repolist_ctx tim.nordell
2016-03-04 23:30 ` [PATCH v2 7/8] ui-repolist: Restructure internal logic to be more extensible tim.nordell
2016-03-04 23:30 ` [PATCH v2 8/8] ui-repolist: Support a trimmed view when several sections are present tim.nordell
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457134177-4094-1-git-send-email-tim.nordell@logicpd.com \
--to=cgit@lists.zx2c4.com \
/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.
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 NNTP newsgroup(s).