use cache for bpph

diff --git a/src/lp_json.c b/src/lp_json.c
index 590d334..e217180 100644 (file)
--- a/src/lp_json.c
+++ b/src/lp_json.c
@@ -64,7 +64,7 @@ static struct bpph *json_to_bpph(json_object *o)
        date_created = json_object_get_string
                (json_object_object_get(o, "date_created"));
        if (date_created)
-               strptime(date_created, "%FT%T%z", &bpph->date_created);
+               strptime(date_created, "%FT%T", &bpph->date_created);
 
        status = json_object_get_string(json_object_object_get(o, "status"));
        if (status)
@@ -111,7 +111,7 @@ static json_object *bpph_to_json(struct bpph *bpph)
        date = malloc(strlen("YY-MM-DDThh:mm:ss+xxx") + 1);
        strftime(date,
                 strlen("YY-MM-DDThh:mm:ss+xxx") + 1,
-                "%FT%T%z",
+                "%FT%T",
                 &bpph->date_created);
 
        json_object_object_add

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 11092c4..fcf08c4 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -59,7 +59,7 @@ static json_object *get_json_object(const char *url)
        return NULL;
 }
 
-static char *get_bpph_list_cache_key(const char *archive_url)
+char *get_bpph_list_cache_key(const char *archive_url)
 {
        char *key;
 
@@ -69,7 +69,7 @@ static char *get_bpph_list_cache_key(const char *archive_url)
        return key;
 }
 
-static struct bpph **get_bpph_list_from_cache(const char *key)
+struct bpph **get_bpph_list_from_cache(const char *key)
 {
        char *content;
        struct bpph **list;
@@ -91,35 +91,76 @@ static struct bpph **get_bpph_list_from_cache(const char *key)
        return list;
 }
 
+struct tm *get_last_creation_date(struct bpph **list)
+{
+       time_t last, t;
+       struct bpph **cur;
+
+       last = 0;
+
+       if (list)
+               for (cur = list; *cur; cur++) {
+                       t = mktime(&(*cur)->date_created);
+                       if (t > last)
+                               last = t;
+               }
+
+       return localtime(&last);
+}
+
 struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
 {
-       char *url, *key;
+       char *url, *key, *tmp;
        struct bpph **result = NULL;
        struct json_object *o, *bpph_json, *o_next;
+       char *created_since_date;
+       struct tm *tm;
+       int ok;
 
-       url = malloc(strlen(archive_url)+
-                    strlen(QUERY_GET_PUBLISHED_BINARIES)+
-                    (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+
-                    1);
-
+       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) {
+               tm = get_last_creation_date(result);
+
+               created_since_date = malloc(200);
+               strftime(created_since_date,
+                        100,
+                        "%FT%T",
+                        tm);
+
+               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 = bpph_list_append_list(result,
                                               json_object_to_bpph_list(o));
@@ -130,13 +171,15 @@ struct bpph **get_bpph_list(const char *archive_url, const char *pkg_status)
                        url = strdup(json_object_get_string(o_next));
 
                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;