From: tim.nordell at logicpd.com (Tim Nordell)
Subject: [PATCH v2 7/8] ui-repolist: Restructure internal logic to be more extensible
Date: Fri, 4 Mar 2016 17:30:30 -0600 [thread overview]
Message-ID: <1457134230-9180-1-git-send-email-tim.nordell@logicpd.com> (raw)
In-Reply-To: <1457133901-12998-1-git-send-email-tim.nordell@logicpd.com>
The internal logic has been restructured so that there is a "walking"
routine that filters the repo list based on the visible criteria, and
subsequently calls a given callback for each repo found. Additionally,
split out generating a table line for a given repo, and a table line
for a given section. This makes this more loosely coupled and allows
reuse of more logic for changes to the way the repo list is displayed.
This is for a future patch in this series.
Signed-off-by: Tim Nordell <tim.nordell at logicpd.com>
diff --git a/ui-repolist.c b/ui-repolist.c
index fab589e..93655d4 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -270,8 +270,12 @@ static int sort_repolist(char *field)
}
struct repolist_ctx {
+ /* From outer contex passed to interior */
int columns;
int sorted;
+
+ /* Used in interior context
+ * (Should be reset in repolist_walk_visible()) */
int hits;
const char *last_section;
};
@@ -290,6 +294,10 @@ static void html_repository(struct cgit_repo *repo, bool sorted)
{
bool is_toplevel;
+ /* Note: cgit_summary_link() ultimately calls repolink(), which is
+ * dependent on ctx.repo pointing to the repo we're working on */
+ ctx.repo = repo;
+
is_toplevel = (NULL != repo->section && '\0' != repo->section[0]);
htmlf("<tr><td class='%s'>",
(!sorted && is_toplevel) ? "sublevel-repo" : "toplevel-repo");
@@ -352,15 +360,45 @@ static inline bool should_emit_section(struct repolist_ctx *c, struct cgit_repo
return true;
}
+static int generate_repolist(struct repolist_ctx *c, struct cgit_repo *repo)
+{
+ c->hits++;
+ if (c->hits <= ctx.qry.ofs)
+ return 0;
+ if (c->hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
+ return 0;
+
+ if (should_emit_section(c, repo))
+ html_section(repo, c->columns);
+ html_repository(repo, c->sorted);
+
+ return 0;
+}
+
+typedef int (*repolist_walk_callback_t)(struct repolist_ctx *c, struct cgit_repo *repo);
+static int repolist_walk_visible(struct repolist_ctx *c, repolist_walk_callback_t callback)
+{
+ struct cgit_repo *repo;
+ int i;
+
+ c->hits = 0;
+ c->last_section = NULL;
+
+ for (i = 0; i < cgit_repolist.count; i++) {
+ repo = &cgit_repolist.repos[i];
+ if (!is_visible(repo))
+ continue;
+ if (NULL != callback)
+ callback(c, repo);
+ }
+ return 0;
+}
+
void cgit_print_repolist(void)
{
struct repolist_ctx repolist_ctx;
- struct repolist_ctx *c = &repolist_ctx;
- int i;
repolist_ctx.columns = 3;
- repolist_ctx.hits = 0;
- repolist_ctx.last_section = NULL;
repolist_ctx.sorted = 0;
if (!any_repos_visible()) {
@@ -388,19 +426,7 @@ void cgit_print_repolist(void)
html("<table summary='repository list' class='list nowrap'>");
print_header();
- for (i = 0; i < cgit_repolist.count; i++) {
- ctx.repo = &cgit_repolist.repos[i];
- if (!is_visible(ctx.repo))
- continue;
- c->hits++;
- if (c->hits <= ctx.qry.ofs)
- continue;
- if (c->hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
- continue;
- if (should_emit_section(&repolist_ctx, ctx.repo))
- html_section(ctx.repo, c->columns);
- html_repository(ctx.repo, repolist_ctx.sorted);
- }
+ repolist_walk_visible(&repolist_ctx, generate_repolist);
html("</table>");
if (repolist_ctx.hits > ctx.cfg.max_repo_count)
print_pager(repolist_ctx.hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
--
2.4.9
next prev parent reply other threads:[~2016-03-04 23:30 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 ` [PATCH v2 5/8] ui-repolist: Factor out logic for emitting a new section heading tim.nordell
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 ` tim.nordell [this message]
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=1457134230-9180-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).