X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=a813b3396bae030f87c8e48c0aa9d1963fea1aa9;hb=60892f2ef45fa1ee656e1a00cac0578f9d6f9536;hp=4549d92c8ab4b2855cae533459e9b5062ca08198;hpb=fa460465ab78c48ace6d8563e6d35917b30fab09;p=ppastats.git diff --git a/src/lp_ws.c b/src/lp_ws.c index 4549d92..a813b33 100644 --- a/src/lp_ws.c +++ b/src/lp_ws.c @@ -20,124 +20,33 @@ #include #define _(String) gettext(String) +#include #include #include -#include -#include #include #include "cache.h" +#include "fcache.h" +#include "http.h" #include "list.h" #include "log.h" #include "lp_ws.h" #include "lp_json.h" #include "ppastats.h" -static const char *QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries"; +static const char * +QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries&ws.size=150"; static const char *QUERY_GET_DOWNLOAD_COUNT = "?ws.op=getDownloadCount"; static const char * QUERY_GET_DAILY_DOWNLOAD_TOTALS = "?ws.op=getDailyDownloadTotals"; -static const int DEFAULT_FETCH_RETRIES = 3; - -static CURL *curl; - -struct ucontent { - char *data; - size_t len; -}; - -static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp) -{ - size_t realsize = size * nmemb; - struct ucontent *mem = (struct ucontent *)userp; - - mem->data = realloc(mem->data, mem->len + realsize + 1); - - memcpy(&(mem->data[mem->len]), buffer, realsize); - mem->len += realsize; - mem->data[mem->len] = 0; - - return realsize; -} - -static char *fetch_url(const char *url) -{ - struct ucontent *content = malloc(sizeof(struct ucontent)); - char *result; - long code; - int retries; - - log_debug(_("fetch_url(): %s"), url); - - if (!curl) { - log_debug(_("initializing CURL")); - curl_global_init(CURL_GLOBAL_ALL); - curl = curl_easy_init(); - } - - if (!curl) - exit(EXIT_FAILURE); - - result = NULL; - - retries = DEFAULT_FETCH_RETRIES; - - retrieve: - content->data = malloc(1); - content->data[0] = '\0'; - content->len = 0; - - curl_easy_setopt(curl, CURLOPT_URL, url); - curl_easy_setopt(curl, CURLOPT_VERBOSE, 0); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, content); - curl_easy_setopt(curl, CURLOPT_USERAGENT, "ppastats/0.0"); - - if (curl_easy_perform(curl) == CURLE_OK) { - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); - - switch (code) { - case 200: - result = content->data; - break; - case 500: - case 502: - case 503: - case 504: - if (retries) { - log_err(_("Fetch failed with code %ld " - "for URL %s"), - code, - url); - - log_debug(_("Wait 5s before retry")); - sleep(5); - - free(content->data); - retries--; - goto retrieve; - } - default: - log_err(_("Fetch failed: %ld"), code); - } - } - - if (!result) - free(content->data); - - free(content); - - return result; -} - static json_object *get_json_object(const char *url) { json_object *obj = NULL; char *body; - body = fetch_url(url); + body = get_url_content(url, 0); if (body) { obj = json_tokener_parse(body); @@ -150,17 +59,11 @@ static json_object *get_json_object(const char *url) return NULL; } -#define json_object_to_bpph_list \ -json_object_to_binary_package_publishing_history_list - -struct binary_package_publishing_history * * -get_binary_package_publishing_history_list(const char *archive_url, - const char *pkg_status) +struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status) { - struct json_object *o_next; - char *url; - json_object *o; - void **result = NULL; + char *url, *bpph_key; + struct bpph **result = NULL; + struct json_object *o, *bpph_json, *o_next; url = malloc(strlen(archive_url)+ strlen(QUERY_GET_PUBLISHED_BINARIES)+ @@ -183,8 +86,9 @@ get_binary_package_publishing_history_list(const char *archive_url, if (!o) break; - result = list_append_list(result, - (void **)json_object_to_bpph_list(o)); + result = (struct bpph **)list_append_list + ((void **)result, + (void **)json_object_to_bpph_list(o)); o_next = json_object_object_get(o, "next_collection_link"); @@ -194,7 +98,16 @@ get_binary_package_publishing_history_list(const char *archive_url, json_object_put(o); } - return (struct binary_package_publishing_history **)result; + bpph_json = bpph_list_to_json(result); + + bpph_key = malloc(strlen(archive_url + 7) + strlen("/bpph") + 1); + sprintf(bpph_key, "%s/bpph", archive_url + 7); + fcache_put(bpph_key, json_object_to_json_string(bpph_json)); + + json_object_put(bpph_json); + free(bpph_key); + + return result; } int get_download_count(const char *archive_url) @@ -224,12 +137,20 @@ const struct distro_arch_series *get_distro_arch_series(const char *url) { json_object *obj; const struct distro_arch_series *distro; + char *content; distro = cache_get(url); if (distro) return (struct distro_arch_series *)distro; - obj = get_json_object(url); + content = get_url_content(url, 1); + + if (!content) + return NULL; + + obj = json_tokener_parse(content); + + free(content); if (!obj) return NULL; @@ -247,12 +168,20 @@ const struct distro_series *get_distro_series(const char *url) { json_object *obj; const struct distro_series *distro; + char *content; distro = cache_get(url); if (distro) return (struct distro_series *)distro; - obj = get_json_object(url); + content = get_url_content(url, 1); + + if (!content) + return NULL; + + obj = json_tokener_parse(content); + + free(content); if (!obj) return NULL; @@ -290,10 +219,3 @@ struct daily_download_total **get_daily_download_totals(const char *binary_url) return result; } -void lp_ws_cleanup() -{ - log_debug(_("cleanup CURL")); - - curl_easy_cleanup(curl); - curl_global_cleanup(); -}