X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=f57aa3b5ec9842a85f412009e1c36128dd2e5b1b;hb=abe6822b309d92edd1cc6bcf488eb584fc30c7bb;hp=a813b3396bae030f87c8e48c0aa9d1963fea1aa9;hpb=60892f2ef45fa1ee656e1a00cac0578f9d6f9536;p=ppastats.git

diff --git a/src/lp_ws.c b/src/lp_ws.c
index a813b33..f57aa3b 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";
@@ -59,36 +60,137 @@ static json_object *get_json_object(const char *url)
 	return NULL;
 }
 
+static char *get_bpph_list_cache_key(const char *archive_url)
+{
+	char *key;
+
+	key = malloc(strlen(archive_url + 7) + strlen("/bpph") + 1);
+	sprintf(key, "%s/bpph", archive_url + 7);
+
+	return key;
+}
+
+static 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;
+}
+
+static char *get_last_creation_date(struct bpph **list)
+{
+	time_t last, t;
+	struct bpph **cur;
+
+	last = 0;
+
+	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;
+	int 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 (status) {
+		strcat(url, status_opt);
+		strcat(url, status);
+	}
+
+	return url;
+}
+
 struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
 {
-	char *url, *bpph_key;
-	struct bpph **result = NULL;
+	char *url, *key, *tmp;
+	struct bpph **result;
 	struct json_object *o, *bpph_json, *o_next;
+	char *date;
+	int ok;
 
-	url = malloc(strlen(archive_url)+
-		     strlen(QUERY_GET_PUBLISHED_BINARIES)+
-		     (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
-		     1);
+	url = create_query_get_bpph(archive_url, pkg_status, -1);
 
-	strcpy(url, archive_url);
-	strcat(url, QUERY_GET_PUBLISHED_BINARIES);
+	key = get_bpph_list_cache_key(archive_url);
+
+	result = get_bpph_list_from_cache(key);
+
+	if (result) {
+		date = get_last_creation_date(result);
 
-	if (pkg_status) {
-		strcat(url, "&status=");
-		strcat(url, pkg_status);
+		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 = (struct bpph **)list_append_list
-			((void **)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");
 
@@ -98,14 +200,13 @@ struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
 		json_object_put(o);
 	}
 
-	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));
+	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(bpph_key);
+	free(key);
 
 	return result;
 }