#include <json.h>
-#include "cache.h"
-#include "fcache.h"
-#include "http.h"
-#include "list.h"
-#include "lp_ws.h"
-#include "lp_json.h"
+#include <cache.h>
+#include <fcache.h>
+#include <http.h>
+#include <list.h>
+#include <lp_ws.h>
+#include <lp_json.h>
#include <plog.h>
-#include "ppastats.h"
+#include <ppastats.h>
#include <ptime.h>
/** Default ws.size value for the getPublishedBinaries request. */
}
if (last)
- return time_to_str(&last);
+ return time_to_ISO8601_time(&last);
else
return NULL;
}
return distro;
}
-char *date_to_str(struct tm tm)
-{
- char *str;
-
- str = malloc(4 + 1 + 2 + 1 + 2 + 1);
-
- strftime(str, 11, "%Y-%m-%d", &tm);
-
- return str;
-}
-
/*
Convert ddts older than 4 weeks to the same JSON representation than
the LP one. Newer ddts are not stored in the cache because the data
d = difftime(tv->tv_sec, t);
if (d > 4 * 7 * 24 * 60 * 60) { /* older than 4 weeks */
- date = date_to_str(ddt->date);
+ date = tm_to_ISO8601_date(&ddt->date);
json_object_object_add(j_ddts,
date,
json_object_new_int(ddt->count));
return j_ddts;
}
-static char *time_t_to_str(time_t t)
-{
- struct tm *tm;
- char *str;
-
- tm = gmtime(&t);
-
- str = date_to_str(*tm);
-
- return str;
-}
-
-char *create_ddts_query(const char *binary_url, time_t st)
+char *create_ddts_query(const char *binary_url, time_t st, time_t et)
{
char *q;
- char *sdate;
+ char *sdate, *edate;
if (st) {
- sdate = time_t_to_str(st);
+ sdate = time_to_ISO8601_date(&st);
q = malloc(strlen(binary_url)
+ strlen(QUERY_GET_DAILY_DOWNLOAD_TOTALS)
+ strlen("&start_date=YYYY-MM-DD")
+ + strlen("&end_date=YYYY-MM-DD")
+ 1);
strcpy(q, binary_url);
strcat(q, QUERY_GET_DAILY_DOWNLOAD_TOTALS);
strcat(q, "&start_date=");
strcat(q, sdate);
+ if (et > 0) {
+ edate = time_to_ISO8601_date(&et);
+ strcat(q, "&end_date=");
+ strcat(q, edate);
+ free(edate);
+ }
+
free(sdate);
} else {
q = malloc(strlen(binary_url)
return q;
}
-struct daily_download_total **get_daily_download_totals(const char *binary_url)
+static struct daily_download_total **retrieve_ddts(const char *binary_url,
+ time_t date_since)
{
- char *url, *key, *content;
+ char *url;
+ json_object *json;
+ struct daily_download_total **ddts, **tmp;
+ time_t crt;
+
+ url = create_ddts_query(binary_url, date_since, 0);
+ json = get_json_object(url);
+ free(url);
+
+ if (json) {
+ ddts = json_object_to_daily_download_totals(json);
+ json_object_put(json);
+ } else {
+ crt = time(NULL);
+ ddts = NULL;
+
+ while (date_since < crt) {
+ url = create_ddts_query(binary_url, date_since, date_since);
+ json = get_json_object(url);
+ free(url);
+
+ if (!json)
+ break;
+
+ tmp = json_object_to_daily_download_totals(json);
+ json_object_put(json);
+ ddts = ddts_merge(ddts, tmp);
+ free(tmp);
+
+ date_since = date_since + 24 * 60 * 60; /* +1 day */
+
+ url = create_ddts_query(binary_url, date_since, 0);
+ json = get_json_object(url);
+ free(url);
+
+ if (json) {
+ tmp = json_object_to_daily_download_totals(json);
+ json_object_put(json);
+ ddts = ddts_merge(ddts, tmp);
+ free(tmp);
+ break;
+ }
+ }
+ }
+
+ return ddts;
+}
+
+struct daily_download_total **get_daily_download_totals(const char *binary_url,
+ time_t date_created)
+{
+ char *key, *content;
json_object *j_ddts, *json;
struct daily_download_total **retrieved_ddts = NULL;
struct daily_download_total **cached_ddts;
key = get_ddts_list_cache_key(binary_url);
content = fcache_get(key);
- if (content)
+ if (content) {
json = json_tokener_parse(content);
- else
+ free(content);
+ } else {
json = NULL;
+ }
if (json) {
cached_ddts = json_object_to_daily_download_totals(json);
+ json_object_put(json);
last_t = ddts_get_last_date(cached_ddts);
} else {
last_t = 0;
cached_ddts = NULL;
}
- url = create_ddts_query(binary_url, last_t);
-
- json = get_json_object(url);
-
- free(url);
-
- if (json) {
- retrieved_ddts = json_object_to_daily_download_totals(json);
+ if (last_t > 0)
+ retrieved_ddts = retrieve_ddts(binary_url, last_t);
+ else
+ retrieved_ddts = retrieve_ddts(binary_url, date_created);
- ddts = ddts_merge(cached_ddts, retrieved_ddts);
+ ddts = ddts_merge(cached_ddts, retrieved_ddts);
- json_object_put(json);
+ if (ddts) {
j_ddts = ddts_to_json_for_cache(ddts);
fcache_put(key, json_object_get_string(j_ddts));
json_object_put(j_ddts);
- } else {
- ddts = NULL;
}
-
free(key);
- free(cached_ddts);
- free(retrieved_ddts);
+
+ if (ddts != cached_ddts)
+ daily_download_total_list_free(cached_ddts);
+ daily_download_total_list_free(retrieved_ddts);
return ddts;
}