X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=fcf08c41b3ce736e1a66510b510bada33df04b8f;hb=cbe5f873c5f0306a7a5d2f431992dbbb6edbe332;hp=20443716c0790ffc3f9d34d7e5f1782d667c232d;hpb=967d20c38c65689c96a0276e6f916b4f8e2617de;p=ppastats.git diff --git a/src/lp_ws.c b/src/lp_ws.c index 2044371..fcf08c4 100644 --- a/src/lp_ws.c +++ b/src/lp_ws.c @@ -20,6 +20,7 @@ #include #define _(String) gettext(String) +#include #include #include @@ -58,36 +59,111 @@ static json_object *get_json_object(const char *url) return NULL; } -struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status) +char *get_bpph_list_cache_key(const char *archive_url) { - struct json_object *o_next; - char *url; - json_object *o; - void **result = NULL; + char *key; + + key = malloc(strlen(archive_url + 7) + strlen("/bpph") + 1); + sprintf(key, "%s/bpph", archive_url + 7); + + return key; +} + +struct bpph **get_bpph_list_from_cache(const char *key) +{ + char *content; + struct bpph **list; + json_object *json; + + content = fcache_get(key); + if (!content) + return NULL; + + json = json_tokener_parse(content); + if (!json) + return NULL; + + list = json_object_to_bpph_list(json); + + json_object_put(json); + free(content); + + return list; +} + +struct tm *get_last_creation_date(struct bpph **list) +{ + time_t last, t; + struct bpph **cur; + + last = 0; - url = malloc(strlen(archive_url)+ - strlen(QUERY_GET_PUBLISHED_BINARIES)+ - (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+ - 1); + if (list) + for (cur = list; *cur; cur++) { + t = mktime(&(*cur)->date_created); + if (t > last) + last = t; + } + return localtime(&last); +} + +struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status) +{ + char *url, *key, *tmp; + struct bpph **result = NULL; + struct json_object *o, *bpph_json, *o_next; + char *created_since_date; + struct tm *tm; + int ok; + + url = malloc(strlen(archive_url) + + strlen(QUERY_GET_PUBLISHED_BINARIES) + + 1); strcpy(url, archive_url); strcat(url, QUERY_GET_PUBLISHED_BINARIES); - if (pkg_status) { - strcat(url, "&status="); - strcat(url, pkg_status); + key = get_bpph_list_cache_key(archive_url); + + result = get_bpph_list_from_cache(key); + + if (result) { + tm = get_last_creation_date(result); + + created_since_date = malloc(200); + strftime(created_since_date, + 100, + "%FT%T", + tm); + + printf("Update package since: %s\n", created_since_date); + + tmp = malloc(strlen(url) + + strlen("&created_since_date=") + + strlen(created_since_date)+1); + strcpy(tmp, url); + strcat(tmp, "&created_since_date="); + strcat(tmp, created_since_date); + + free(url); + url = tmp; + + free(created_since_date); } + ok = 1; while (url) { o = get_json_object(url); free(url); url = NULL; - if (!o) + if (!o) { + ok = 0; break; + } - result = list_append_list(result, - (void **)json_object_to_bpph_list(o)); + result = bpph_list_append_list(result, + json_object_to_bpph_list(o)); o_next = json_object_object_get(o, "next_collection_link"); @@ -95,9 +171,18 @@ struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status) url = strdup(json_object_get_string(o_next)); json_object_put(o); + } - return (struct bpph **)result; + if (ok) { + bpph_json = bpph_list_to_json(result); + fcache_put(key, json_object_to_json_string(bpph_json)); + json_object_put(bpph_json); + } + + free(key); + + return result; } int get_download_count(const char *archive_url)