removed used local var initialization

[ppastats.git] / src / lp_ws.c

diff --git a/src/lp_ws.c b/src/lp_ws.c
index a813b33..ecc95cc 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -59,36 +59,110 @@ 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;
+}
+
 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 *created_since_date;
+       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) {
+               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 = (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 +172,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;
 }