X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=3086e6f3960eb3c5bf7e3cfd1944e35e42a7f456;hb=c75862be119ac38a67f841fcc7da339be423973a;hp=11092c4e3228566928ab8addb49735049eacb4fe;hpb=a9435991d03d0bd9e81d6cb6003013bec4b2e6e9;p=ppastats.git

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 11092c4..3086e6f 100644
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -35,8 +35,9 @@
 #include "lp_json.h"
 #include "ppastats.h"
 
-static const char *
-QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries&ws.size=150";
+/** Default ws.size value for the getPublishedBinaries request. */
+static const int DEFAULT_WS_SIZE = 150;
+
 static const char *QUERY_GET_DOWNLOAD_COUNT = "?ws.op=getDownloadCount";
 static const char *
 QUERY_GET_DAILY_DOWNLOAD_TOTALS = "?ws.op=getDailyDownloadTotals";
@@ -91,35 +92,104 @@ static struct bpph **get_bpph_list_from_cache(const char *key)
 	return list;
 }
 
-struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
+static char *get_last_creation_date(struct bpph **list)
 {
-	char *url, *key;
-	struct bpph **result = NULL;
-	struct json_object *o, *bpph_json, *o_next;
+	time_t last, t;
+	struct bpph **cur;
 
-	url = malloc(strlen(archive_url)+
-		     strlen(QUERY_GET_PUBLISHED_BINARIES)+
-		     (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
-		     1);
+	last = 0;
 
-	strcpy(url, archive_url);
-	strcat(url, QUERY_GET_PUBLISHED_BINARIES);
+	if (list)
+		for (cur = list; *cur; cur++) {
+			t = (*cur)->date_created;
+			if (t > last)
+				last = t;
+		}
+
+	if (last)
+		return time_to_str(last);
+	else
+		return NULL;
+}
+
+/*
+ * 'archive_url': LP URL of the archive.
+ * 'size': size of the reply array. Between 1-300, else default value is used.
+ */
+static char *create_query_get_bpph(const char *archive_url,
+				   const char *status,
+				   int size)
+{
+	static const char *default_opt = "?ws.op=getPublishedBinaries&ws.size=";
+	static const char *status_opt = "&status=";
+	char *url;
+	size_t n;
+
+	if (size < 1 || size > 300)
+		size = DEFAULT_WS_SIZE;
+
+	n = strlen(archive_url) + strlen(default_opt) + 3 + 1;
+
+	if (status)
+		n += strlen(status_opt) + strlen(status);
+
+	url = malloc(n);
+	sprintf(url, "%s%s%d", archive_url, default_opt, size);
 
-	if (pkg_status) {
-		strcat(url, "&status=");
-		strcat(url, pkg_status);
+	if (status) {
+		strcat(url, status_opt);
+		strcat(url, status);
 	}
 
+	return url;
+}
+
+struct bpph **get_bpph_list(const char *archive_url,
+			    const char *pkg_status,
+			    int ws_size)
+{
+	char *url, *key, *tmp;
+	struct bpph **result;
+	struct json_object *o, *bpph_json, *o_next;
+	char *date;
+	int ok;
+
+	url = create_query_get_bpph(archive_url, pkg_status, ws_size);
+
 	key = get_bpph_list_cache_key(archive_url);
+
 	result = get_bpph_list_from_cache(key);
 
+	if (result) {
+		date = get_last_creation_date(result);
+
+		if (date) {
+			printf("Update package since: %s\n", date);
+
+			tmp = malloc(strlen(url)
+				     + strlen("&created_since_date=")
+				     + strlen(date)+1);
+			strcpy(tmp, url);
+			strcat(tmp, "&created_since_date=");
+			strcat(tmp, date);
+
+			free(url);
+			url = tmp;
+
+			free(date);
+		}
+	}
+
+	ok = 1;
 	while (url) {
 		o = get_json_object(url);
 		free(url);
 		url = NULL;
 
-		if (!o)
+		if (!o) {
+			ok = 0;
 			break;
+		}
 
 		result = bpph_list_append_list(result,
 					       json_object_to_bpph_list(o));
@@ -132,11 +202,12 @@ struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
 		json_object_put(o);
 	}
 
-	bpph_json = bpph_list_to_json(result);
-
-	fcache_put(key, json_object_to_json_string(bpph_json));
+	if (ok) {
+		bpph_json = bpph_list_to_json(result);
+		fcache_put(key, json_object_to_json_string(bpph_json));
+		json_object_put(bpph_json);
+	}
 
-	json_object_put(bpph_json);
 	free(key);
 
 	return result;