X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_json.c;h=6f251f3ed5b42ceba9dd9381c621c2cd1a0ced44;hb=12cf1b3a4702e58c5797be638ab48e899ef932a4;hp=7cd0a8635a1c564fce821947118fc0af2585535e;hpb=0ffa32c4daf36b425e7aca8caf1d2f81809be2ee;p=ppastats.git diff --git a/src/lp_json.c b/src/lp_json.c index 7cd0a86..6f251f3 100644 --- a/src/lp_json.c +++ b/src/lp_json.c @@ -1,40 +1,72 @@ /* - Copyright (C) 2011 jeanfi@gmail.com + * Copyright (C) 2011-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#define _XOPEN_SOURCE_EXTENDED +#define _XOPEN_SOURCE +#include +#include +#include +#include - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. +#include "lp_json.h" +#include "lp_ws.h" - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. +static time_t json_to_time(json_object *json) +{ + const char *str; + struct tm tm; + char *ret; - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ + str = json_object_get_string(json); + if (!str) + return -1; -#define _XOPEN_SOURCE -#include + tm.tm_isdst = -1; + ret = strptime(str, "%FT%T", &tm); + if (ret) + return mktime(&tm); + else + return -1; +} -#include -#include +static json_object *time_to_json(time_t t) +{ + char *str; -#include "lp_json.h" -#include "lp_ws.h" + str = time_to_str(t); + + if (str) + return json_object_new_string(str); + else + return NULL; +} -struct binary_package_publishing_history * -json_object_to_binary_package_publishing_history(json_object *o) +static struct bpph *json_to_bpph(json_object *o) { const char *binary_package_name; const char *binary_package_version; const char *distro_arch_series_link; const char *self_link; - int architecture_specific; + int arch_specific; + struct bpph *bpph; + const char *status; + time_t date_created; binary_package_name = json_object_get_string (json_object_object_get(o, "binary_package_name")); @@ -48,17 +80,60 @@ json_object_to_binary_package_publishing_history(json_object *o) self_link = json_object_get_string (json_object_object_get(o, "self_link")); - if (json_object_get_boolean - (json_object_object_get(o, "architecture_specific"))) - architecture_specific = 1; - else - architecture_specific = 0; + arch_specific = json_object_get_boolean + (json_object_object_get(o, "architecture_specific")); + + date_created = json_to_time(json_object_object_get(o, "date_created")); + + status = json_object_get_string(json_object_object_get(o, "status")); + + bpph = bpph_new(binary_package_name, + binary_package_version, + distro_arch_series_link, + self_link, + status, + arch_specific, + date_created); - return binary_package_publishing_history_new(binary_package_name, - binary_package_version, - distro_arch_series_link, - self_link, - architecture_specific); + return bpph; +} + +static json_object *bpph_to_json(struct bpph *bpph) +{ + json_object *json; + + json = json_object_new_object(); + + json_object_object_add + (json, + "binary_package_name", + json_object_new_string(bpph->binary_package_name)); + + json_object_object_add + (json, + "binary_package_version", + json_object_new_string(bpph->binary_package_version)); + + json_object_object_add + (json, + "distro_arch_series_link", + json_object_new_string(bpph->distro_arch_series_link)); + + json_object_object_add + (json, "self_link", json_object_new_string(bpph->self_link)); + + json_object_object_add + (json, + "architecture_specific", + json_object_new_boolean(bpph->architecture_specific)); + + json_object_object_add + (json, "status", json_object_new_string(bpph->status)); + + json_object_object_add + (json, "date_created", time_to_json(bpph->date_created)); + + return json; } struct distro_arch_series *json_object_to_distro_arch_series(json_object *o) @@ -69,7 +144,6 @@ struct distro_arch_series *json_object_to_distro_arch_series(json_object *o) boolean is_nominated_arch_indep; const char *distroseries_link; - display_name = json_object_get_string (json_object_object_get(o, "display_name")); @@ -102,14 +176,11 @@ struct distro_series *json_object_to_distro_series(json_object *o) displayname = json_object_get_string (json_object_object_get(o, "displayname")); - title = json_object_get_string - (json_object_object_get(o, "title")); + title = json_object_get_string(json_object_object_get(o, "title")); - version = json_object_get_string - (json_object_object_get(o, "version")); + version = json_object_get_string(json_object_object_get(o, "version")); - name = json_object_get_string - (json_object_object_get(o, "name")); + name = json_object_get_string(json_object_object_get(o, "name")); return distro_series_new(name, version, @@ -117,13 +188,11 @@ struct distro_series *json_object_to_distro_series(json_object *o) displayname); } -struct binary_package_publishing_history * * -json_object_to_binary_package_publishing_history_list(json_object *o) +struct bpph **json_object_to_bpph_list(json_object *o) { json_object *o_entries; int i, n, i2; - struct binary_package_publishing_history **entries; - struct binary_package_publishing_history *h; + struct bpph **entries, *h; const struct distro_arch_series *distro; o_entries = json_object_object_get(o, "entries"); @@ -134,18 +203,18 @@ json_object_to_binary_package_publishing_history_list(json_object *o) n = json_object_array_length(o_entries); entries = malloc - (sizeof(struct binary_package_publishing_history *)*(n+1)); + (sizeof(struct bpph *)*(n+1)); for (i = 0, i2 = 0; i < n; i++) { - h = json_object_to_binary_package_publishing_history - (json_object_array_get_idx(o_entries, i)); + h = json_to_bpph(json_object_array_get_idx(o_entries, + i)); if (!h->architecture_specific) { distro = get_distro_arch_series (h->distro_arch_series_link); - if (!distro->is_nominated_arch_indep) { - binary_package_publishing_history_free(h); + if (!distro || !distro->is_nominated_arch_indep) { + bpph_free(h); continue ; } } @@ -158,6 +227,23 @@ json_object_to_binary_package_publishing_history_list(json_object *o) return entries; } +json_object *bpph_list_to_json(struct bpph **list) +{ + json_object *result, *entries; + struct bpph **cur; + + result = json_object_new_object(); + + entries = json_object_new_array(); + json_object_object_add(result, "entries", entries); + + if (list) + for (cur = list; *cur; cur++) + json_object_array_add(entries, bpph_to_json(*cur)); + + return result; +} + struct daily_download_total * json_object_to_daily_download_total(const char *d, json_object *o_c) { @@ -174,9 +260,13 @@ json_object_to_daily_download_total(const char *d, json_object *o_c) static int json_object_get_fields_count(json_object *o) { int n = 0; + struct lh_entry *entry; - json_object_object_foreach(o, key, val) + entry = json_object_get_object(o)->head; + while (entry) { + entry = entry->next; n++; + } return n; }