X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=523f185bcd7a4e54b97f5e97a9f30af2b917be6d;hb=474ab6fa492a8b1dde963fdecb1edebc111c5fb2;hp=3905a2813648a1ed525fdc7884a452cd40523bf5;hpb=ffb8a406a1cf1b501dd3e3051e6028486c76f1e7;p=ppastats.git

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 3905a28..523f185 100644
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2014 jeanfi@gmail.com
+ * Copyright (C) 2011-2015 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
@@ -28,14 +28,14 @@
 
 #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. */
@@ -205,7 +205,7 @@ struct bpph **get_bpph_list(const char *archive_url,
 		result = bpph_list_append_list(result,
 					       json_object_to_bpph_list(o));
 
-		o_next = json_object_object_get(o, "next_collection_link");
+		json_object_object_get_ex(o, "next_collection_link", &o_next);
 
 		if (o_next)
 			url = strdup(json_object_get_string(o_next));
@@ -352,10 +352,10 @@ static json_object *ddts_to_json_for_cache(struct daily_download_total **ddts)
 	return j_ddts;
 }
 
-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_to_ISO8601_date(&st);
@@ -363,12 +363,20 @@ char *create_ddts_query(const char *binary_url, time_t 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)
@@ -381,9 +389,64 @@ char *create_ddts_query(const char *binary_url, time_t st)
 	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;
+	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 *url, *key, *content;
+	char *key, *content;
 	json_object *j_ddts, *json;
 	struct daily_download_total **retrieved_ddts = NULL;
 	struct daily_download_total **cached_ddts;
@@ -402,35 +465,30 @@ struct daily_download_total **get_daily_download_totals(const char *binary_url)
 
 	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);
+
 	if (ddts != cached_ddts)
-		free(cached_ddts);
-	free(retrieved_ddts);
+		daily_download_total_list_free(cached_ddts);
+	daily_download_total_list_free(retrieved_ddts);
 
 	return ddts;
 }