X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=ecc95cc30c7c26fd87713ea27f02be2c2ce5782d;hb=23b63657e6e51b811ff70824a69c594039cfbf66;hp=63a8d36952ea1f1d25d5582b69e01987d1c554c3;hpb=5969698ff6028947e097927e2391406481a36290;p=ppastats.git

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 63a8d36..ecc95cc 100644
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -20,6 +20,7 @@
 #include <libintl.h>
 #define _(String) gettext(String)
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,7 +36,7 @@
 #include "ppastats.h"
 
 static const char *
-QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries&ws.size=300";
+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";
@@ -58,41 +59,110 @@ 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
+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);
 
-struct binary_package_publishing_history * *
-get_binary_package_publishing_history_list(const char *archive_url,
-					   const char *pkg_status)
+	return key;
+}
+
+static struct bpph **get_bpph_list_from_cache(const char *key)
 {
-	struct json_object *o_next;
-	char *url;
-	json_object *o;
-	void **result = NULL;
+	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;
+		}
 
-	url = malloc(strlen(archive_url)+
-		     strlen(QUERY_GET_PUBLISHED_BINARIES)+
-		     (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
-		     1);
+	if (last)
+		return time_to_str(last);
+	else
+		return NULL;
+}
 
+struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
+{
+	char *url, *key, *tmp;
+	struct bpph **result;
+	struct json_object *o, *bpph_json, *o_next;
+	char *created_since_date;
+	int ok;
+
+	url = malloc(strlen(archive_url)
+		     + strlen(QUERY_GET_PUBLISHED_BINARIES)
+		     + 1);
 	strcpy(url, archive_url);
 	strcat(url, QUERY_GET_PUBLISHED_BINARIES);
 
-	if (pkg_status) {
-		strcat(url, "&status=");
-		strcat(url, pkg_status);
+	key = get_bpph_list_cache_key(archive_url);
+
+	result = get_bpph_list_from_cache(key);
+
+	if (result) {
+		created_since_date = get_last_creation_date(result);
+
+		if (created_since_date) {
+			printf("Update package since: %s\n",
+			       created_since_date);
+
+			tmp = malloc(strlen(url)
+				     + strlen("&created_since_date=")
+				     + strlen(created_since_date)+1);
+			strcpy(tmp, url);
+			strcat(tmp, "&created_since_date=");
+			strcat(tmp, created_since_date);
+
+			free(url);
+			url = tmp;
+
+			free(created_since_date);
+		}
 	}
 
+	ok = 1;
 	while (url) {
 		o = get_json_object(url);
 		free(url);
 		url = NULL;
 
-		if (!o)
+		if (!o) {
+			ok = 0;
 			break;
+		}
 
-		result = list_append_list(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");
 
@@ -102,7 +172,15 @@ get_binary_package_publishing_history_list(const char *archive_url,
 		json_object_put(o);
 	}
 
-	return (struct binary_package_publishing_history **)result;
+	if (ok) {
+		bpph_json = bpph_list_to_json(result);
+		fcache_put(key, json_object_to_json_string(bpph_json));
+		json_object_put(bpph_json);
+	}
+
+	free(key);
+
+	return result;
 }
 
 int get_download_count(const char *archive_url)
@@ -139,7 +217,7 @@ const struct distro_arch_series *get_distro_arch_series(const char *url)
 		return (struct distro_arch_series *)distro;
 
 	content = get_url_content(url, 1);
-	
+
 	if (!content)
 		return NULL;