From 792ac4ec66dd098109a88065420ef95c1a78624f Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Sat, 27 Apr 2019 04:22:56 +0200 Subject: make: support posts autoloading --- src/blogc-make/rules.c | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'src/blogc-make/rules.c') diff --git a/src/blogc-make/rules.c b/src/blogc-make/rules.c index 96cf51d..f42b99a 100644 --- a/src/blogc-make/rules.c +++ b/src/blogc-make/rules.c @@ -32,7 +32,9 @@ posts_ordering(bm_ctx_t *ctx, bc_trie_t *variables, const char *variable) const char *value = bm_ctx_settings_lookup_str(ctx, variable); bool asc = 0 == strcasecmp(value, "asc"); - bool sort = bc_str_to_bool(bm_ctx_settings_lookup(ctx, "posts_sort")); + bool posts_autoload = bc_str_to_bool(bm_ctx_settings_lookup(ctx, "posts_autoload")); + bool posts_sort = bc_str_to_bool(bm_ctx_settings_lookup(ctx, "posts_sort")); + bool sort = posts_sort || posts_autoload; if (sort) { bc_trie_insert(variables, "FILTER_SORT", bc_strdup("1")); @@ -75,7 +77,7 @@ posts_pagination_enabled(bm_ctx_t *ctx, const char *variable) static bc_slist_t* index_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return NULL; if (!posts_pagination_enabled(ctx, "posts_per_page")) @@ -97,7 +99,7 @@ index_outputlist(bm_ctx_t *ctx) static int index_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return 0; int rv = 0; @@ -114,7 +116,8 @@ index_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) bm_filectx_t *fctx = l->data; if (fctx == NULL) continue; - if (bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, + if (ctx->posts_deleted || + bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, ctx->listing_entry_fctx, ctx->main_template_fctx, fctx, false)) { rv = bm_exec_blogc(ctx, variables, NULL, true, ctx->listing_entry_fctx, @@ -135,7 +138,7 @@ index_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) static bc_slist_t* atom_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return NULL; if (!posts_pagination_enabled(ctx, "atom_posts_per_page")) @@ -157,7 +160,7 @@ atom_outputlist(bm_ctx_t *ctx) static int atom_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return 0; int rv = 0; @@ -173,7 +176,8 @@ atom_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) bm_filectx_t *fctx = l->data; if (fctx == NULL) continue; - if (bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, NULL, NULL, + if (ctx->posts_deleted || + bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, NULL, NULL, fctx, false)) { rv = bm_exec_blogc(ctx, variables, NULL, true, NULL, ctx->atom_template_fctx, @@ -194,7 +198,7 @@ atom_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) static bc_slist_t* atom_tags_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL || ctx->settings->tags == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL || ctx->settings->tags == NULL) return NULL; if (!posts_pagination_enabled(ctx, "atom_posts_per_page")) @@ -218,7 +222,7 @@ atom_tags_outputlist(bm_ctx_t *ctx) static int atom_tags_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL || ctx->settings->tags == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL || ctx->settings->tags == NULL) return 0; int rv = 0; @@ -239,7 +243,8 @@ atom_tags_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) bc_trie_insert(variables, "FILTER_TAG", bc_strdup(ctx->settings->tags[i])); - if (bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, NULL, NULL, + if (ctx->posts_deleted || + bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, NULL, NULL, fctx, false)) { rv = bm_exec_blogc(ctx, variables, NULL, true, NULL, ctx->atom_template_fctx, @@ -260,7 +265,7 @@ atom_tags_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) static bc_slist_t* pagination_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return NULL; // not using posts_pagination_enabled() here because we need to calculate @@ -293,7 +298,7 @@ pagination_outputlist(bm_ctx_t *ctx) static int pagination_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return 0; int rv = 0; @@ -315,7 +320,8 @@ pagination_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) if (fctx == NULL) continue; bc_trie_insert(variables, "FILTER_PAGE", bc_strdup_printf("%zu", page)); - if (bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, + if (ctx->posts_deleted || + bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, ctx->listing_entry_fctx, ctx->main_template_fctx, fctx, false)) { rv = bm_exec_blogc(ctx, variables, NULL, true, ctx->listing_entry_fctx, @@ -336,7 +342,7 @@ pagination_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) static bc_slist_t* posts_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return NULL; bc_slist_t *rv = NULL; @@ -344,9 +350,10 @@ posts_outputlist(bm_ctx_t *ctx) const char *post_prefix = bm_ctx_settings_lookup(ctx, "post_prefix"); const char *html_ext = bm_ctx_settings_lookup(ctx, "html_ext"); - for (size_t i = 0; ctx->settings->posts[i] != NULL; i++) { + for (bc_slist_t *l = ctx->posts_fctx; l != NULL; l = l->next) { + bm_filectx_t *fc = l->data; char *f = bm_generate_filename(ctx->short_output_dir, post_prefix, - ctx->settings->posts[i], html_ext); + fc->slug, html_ext); rv = bc_slist_append(rv, bm_filectx_new(ctx, f, NULL, NULL)); free(f); } @@ -357,7 +364,7 @@ posts_outputlist(bm_ctx_t *ctx) static int posts_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL) return 0; int rv = 0; @@ -403,7 +410,7 @@ posts_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) static bc_slist_t* tags_outputlist(bm_ctx_t *ctx) { - if (ctx == NULL || ctx->settings->posts == NULL || ctx->settings->tags == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL || ctx->settings->tags == NULL) return NULL; if (!posts_pagination_enabled(ctx, "posts_per_page")) @@ -427,7 +434,7 @@ tags_outputlist(bm_ctx_t *ctx) static int tags_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) { - if (ctx == NULL || ctx->settings->posts == NULL || ctx->settings->tags == NULL) + if (ctx == NULL || ctx->posts_fctx == NULL || ctx->settings->tags == NULL) return 0; int rv = 0; @@ -449,7 +456,8 @@ tags_exec(bm_ctx_t *ctx, bc_slist_t *outputs, bc_trie_t *args) bc_trie_insert(variables, "FILTER_TAG", bc_strdup(ctx->settings->tags[i])); - if (bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, + if (ctx->posts_deleted || + bm_rule_need_rebuild(ctx->posts_fctx, ctx->settings_fctx, ctx->listing_entry_fctx, ctx->main_template_fctx, fctx, false)) { rv = bm_exec_blogc(ctx, variables, NULL, true, ctx->listing_entry_fctx, -- cgit v1.2.3-18-g5258