From 74dfcce06d39060a4a97c1dd06db9eb55cdbf001 Mon Sep 17 00:00:00 2001
From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
Date: Sun, 15 Nov 2015 22:13:30 -0200
Subject: directives: content-parser: added blogc_directive_ctx_t

---
 src/content-parser.c | 10 ++++++++--
 src/directives.c     | 32 ++++++++++++++++++--------------
 src/directives.h     | 15 ++++++++++-----
 3 files changed, 36 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/content-parser.c b/src/content-parser.c
index 8bdd861..8e98405 100644
--- a/src/content-parser.c
+++ b/src/content-parser.c
@@ -1118,8 +1118,14 @@ param_end:
                 if (c == '\n' || c == '\r' || is_last) {
                     // FIXME: handle errors in the rest of the parser.
                     blogc_error_t *err = NULL;
-                    char *rv_d = blogc_directive_loader(directive_name,
-                        directive_argument, directive_params, &err);
+                    blogc_directive_ctx_t *ctx = b_malloc(
+                        sizeof(blogc_directive_ctx_t));
+                    ctx->name = directive_name;
+                    ctx->argument = directive_argument;
+                    ctx->params = directive_params;
+                    ctx->eol = line_ending;
+                    char *rv_d = blogc_directive_loader(ctx, &err);
+                    free(ctx);
                     blogc_error_print(err);
                     if (rv_d != NULL)
                         b_string_append(rv, rv_d);
diff --git a/src/directives.c b/src/directives.c
index 829a736..ed8b568 100644
--- a/src/directives.c
+++ b/src/directives.c
@@ -24,36 +24,40 @@ blogc_directive_t registry[] = {
 
 
 char*
-blogc_directive_loader(const char *name, const char *argument, b_trie_t *params,
-    blogc_error_t **err)
+blogc_directive_loader(blogc_directive_ctx_t *ctx, blogc_error_t **err)
 {
-    for (unsigned int i = 0; registry[i].name != NULL; i++)
-        if (0 == strcmp(name, registry[i].name))
-            return registry[i].callback(argument, params, err);
+    if (ctx == NULL)
+        return NULL;
+    for (unsigned int i = 0; registry[i].name != NULL; i++) {
+        if (0 == strcmp(ctx->name, registry[i].name)) {
+            if (err != NULL && *err != NULL) {
+                return NULL;
+            }
+            return registry[i].callback(ctx, err);
+        }
+    }
     return NULL;
 }
 
 
 char*
-blogc_directive_youtube(const char *argument, b_trie_t *params, blogc_error_t **err)
+blogc_directive_youtube(blogc_directive_ctx_t *ctx, blogc_error_t **err)
 {
-    if (err != NULL && *err != NULL)
-        return NULL;
-    if (argument == NULL) {
+    if (ctx->argument == NULL) {
         *err = blogc_error_new_printf(BLOGC_WARNING_CONTENT_PARSER,
-            "youtube: Invalid video ID: %s", argument);
+            "youtube: Invalid video ID: %s", ctx->argument);
         return NULL;
     }
 
-    char *width = b_trie_lookup(params, "width");
-    char *height = b_trie_lookup(params, "height");
+    char *width = b_trie_lookup(ctx->params, "width");
+    char *height = b_trie_lookup(ctx->params, "height");
 
     // using default 16:9 sizes provided by youtube as of 2015-11-04
     return b_strdup_printf(
         "<iframe width=\"%s\" height=\"%s\" "
         "src=\"https://www.youtube.com/embed/%s\" frameborder=\"0\" "
-        "allowfullscreen></iframe>\n",
+        "allowfullscreen></iframe>%s",
         width == NULL ? "560" : width,
         height == NULL ? "315" : height,
-        argument);
+        ctx->argument, ctx->eol);
 }
diff --git a/src/directives.h b/src/directives.h
index cbfd213..dd27f03 100644
--- a/src/directives.h
+++ b/src/directives.h
@@ -12,7 +12,14 @@
 #include "utils/utils.h"
 #include "error.h"
 
-typedef char* (*blogc_directive_func_t)(const char *argument, b_trie_t *params,
+typedef struct {
+    const char *name;
+    const char *argument;
+    b_trie_t *params;
+    const char *eol;
+} blogc_directive_ctx_t;
+
+typedef char* (*blogc_directive_func_t)(blogc_directive_ctx_t *ctx,
     blogc_error_t **err);
 
 typedef struct {
@@ -20,12 +27,10 @@ typedef struct {
     blogc_directive_func_t callback;
 } blogc_directive_t;
 
-char* blogc_directive_loader(const char *name, const char *argument,
-    b_trie_t *params, blogc_error_t **err);
+char* blogc_directive_loader(blogc_directive_ctx_t *ctx, blogc_error_t **err);
 
 
 // built-in directives (that are everything we support right now
-char* blogc_directive_youtube(const char *argument, b_trie_t *params,
-    blogc_error_t **err);
+char* blogc_directive_youtube(blogc_directive_ctx_t *ctx, blogc_error_t **err);
 
 #endif /* _DIRECTIVES_H */
-- 
cgit v1.2.3-18-g5258