refactoring (in progress, tbf)

[src/app-framework-binder.git] / src / afb-hreq.c

diff --git a/src/afb-hreq.c b/src/afb-hreq.c
index 60ff6b0..506091c 100644 (file)
--- a/src/afb-hreq.c
+++ b/src/afb-hreq.c
@@ -36,6 +36,14 @@ struct hreq_data {
        char *value;
 };
 
+static struct afb_arg getarg(struct afb_hreq *hreq, const char *name);
+static void iterargs(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure);
+
+static const struct afb_req_itf afb_hreq_itf = {
+       .get = (void*)getarg,
+       .iterate = (void*)iterargs
+};
+
 static struct hreq_data *get_data(struct afb_hreq *hreq, const char *key, int create)
 {
        struct hreq_data *data = hreq->data;
@@ -279,12 +287,6 @@ const char *afb_hreq_get_header(struct afb_hreq *hreq, const char *name)
        return MHD_lookup_connection_value(hreq->connection, MHD_HEADER_KIND, name);
 }
 
-const struct afb_req_itf afb_hreq_itf = {
-       .get_cookie = (void*)afb_hreq_get_cookie,
-       .get_argument = (void*)afb_hreq_get_argument
-};
-
-
 void afb_hreq_post_end(struct afb_hreq *hreq)
 {
        struct hreq_data *data = hreq->data;
@@ -340,3 +342,107 @@ int afb_hreq_post_add_file(struct afb_hreq *hreq, const char *key, const char *f
        
 }
 
+int afb_hreq_is_argument_a_file(struct afb_hreq *hreq, const char *key)
+{
+       struct hreq_data *hdat = get_data(hreq, key, 0);
+       return hdat != NULL && hdat->file != 0;
+}
+
+
+struct afb_req afb_hreq_to_req(struct afb_hreq *hreq)
+{
+       return (struct afb_req){ .itf = &afb_hreq_itf, .data = hreq };
+}
+
+struct iterator_data
+{
+       struct afb_hreq *hreq;
+       int (*iterator)(void *closure, const char *key, const char *value, int isfile);
+       void *closure;
+};
+
+static int itargs(struct iterator_data *id, enum MHD_ValueKind kind, const char *key, const char *value)
+{
+       if (get_data(id->hreq, key, 0))
+               return 1;
+       return id->iterator(id->closure, key, value, 0);
+}
+
+void afb_hreq_iterate_arguments(struct afb_hreq *hreq, int (*iterator)(void *closure, const char *key, const char *value, int isfile), void *closure)
+{
+       struct iterator_data id = { .hreq = hreq, .iterator = iterator, .closure = closure };
+       struct hreq_data *data = hreq->data;
+       while (data) {
+               if (!iterator(closure, data->key, data->value, !!data->file))
+                       return;
+               data = data->next;
+       }
+       MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)itargs, &id);
+}
+
+static struct afb_arg getarg(struct afb_hreq *hreq, const char *name)
+{
+       struct hreq_data *hdat = get_data(hreq, name, 0);
+       if (hdat)
+               return (struct afb_arg){
+                       .name = hdat->key,
+                       .value = hdat->value,
+                       .size = hdat->length,
+                       .is_file = (hdat->file != 0)
+               };
+               
+       return (struct afb_arg){
+               .name = name,
+               .value = MHD_lookup_connection_value(hreq->connection, MHD_GET_ARGUMENT_KIND, name),
+               .size = 0,
+               .is_file = 0
+       };
+}
+
+struct iterdata
+{
+       struct afb_hreq *hreq;
+       int (*iterator)(void *closure, struct afb_arg arg);
+       void *closure;
+};
+
+static int _iterargs_(struct iterdata *id, enum MHD_ValueKind kind, const char *key, const char *value)
+{
+       if (get_data(id->hreq, key, 0))
+               return 1;
+       return id->iterator(id->closure, (struct afb_arg){
+               .name = key,
+               .value = value,
+               .size = 0,
+               .is_file = 0
+       });
+}
+
+static void iterargs(struct afb_hreq *hreq, int (*iterator)(void *closure, struct afb_arg arg), void *closure)
+{
+       struct iterdata id = { .hreq = hreq, .iterator = iterator, .closure = closure };
+       struct hreq_data *hdat = hreq->data;
+       while (hdat) {
+               if (!iterator(closure, (struct afb_arg){
+                       .name = hdat->key,
+                       .value = hdat->value,
+                       .size = hdat->length,
+                       .is_file = (hdat->file != 0)}))
+                       return;
+               hdat = hdat->next;
+       }
+       MHD_get_connection_values (hreq->connection, MHD_GET_ARGUMENT_KIND, (void*)_iterargs_, &id);
+}
+
+void afb_hreq_drop_data(struct afb_hreq *hreq)
+{
+       struct hreq_data *data = hreq->data;
+       while (data) {
+               hreq->data = data->next;
+               free(data->key);
+               free(data->value);
+               free(data);
+               data = hreq->data;
+       }
+}
+