top_srcdir = ..
-prefix = /usr
+prefix = /tmp/p
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
datadir = ${datarootdir}
top_srcdir = ..
-prefix = /usr
+prefix = /tmp/p
exec_prefix = ${prefix}
datarootdir = ${prefix}/share
datadir = ${datarootdir}
cache.h cache.c\
fcache.h fcache.c\
html.h html.c\
+ http.h http.c\
io.h io.c\
list.h list.c\
log.h log.c\
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
am_ppastats_OBJECTS = cache.$(OBJEXT) fcache.$(OBJEXT) html.$(OBJEXT) \
- io.$(OBJEXT) list.$(OBJEXT) log.$(OBJEXT) lp.$(OBJEXT) \
- lp_json.$(OBJEXT) lp_ws.$(OBJEXT) main.$(OBJEXT) \
+ http.$(OBJEXT) io.$(OBJEXT) list.$(OBJEXT) log.$(OBJEXT) \
+ lp.$(OBJEXT) lp_json.$(OBJEXT) lp_ws.$(OBJEXT) main.$(OBJEXT) \
ppastats.$(OBJEXT) str.$(OBJEXT)
ppastats_OBJECTS = $(am_ppastats_OBJECTS)
ppastats_LDADD = $(LDADD)
cache.h cache.c\
fcache.h fcache.c\
html.h html.c\
+ http.h http.c\
io.h io.c\
list.h list.c\
log.h log.c\
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcache.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/html.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/http.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/io.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
char *path;
const char *dir;
+ if (!key || !*key || *key != '/')
+ return NULL;
+
dir = get_cache_dir();
if (!dir)
return NULL;
- path = malloc(strlen(dir) + 1 + strlen(key) + strlen("/data.json") + 1);
- sprintf(path, "%s%s/data.json", dir, key);
+ path = malloc(strlen(dir) + 1 + strlen(key) + strlen("/data") + 1);
+ sprintf(path, "%s%s/data", dir, key);
return path;
}
char *path, *content;
path = key_to_path(key);
- if (!path)
+ if (!path) {
+ log_err(_("file cache, invalid key: %s"), key);
return NULL;
+ }
content = file_get_content(path);
--- /dev/null
+/*
+ * Copyright (C) 2011-2012 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <libintl.h>
+#define _(String) gettext(String)
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <curl/curl.h>
+
+#include "fcache.h"
+#include "http.h"
+#include "log.h"
+
+static const int DEFAULT_FETCH_RETRIES = 10;
+
+static CURL *curl;
+
+struct ucontent {
+ char *data;
+ size_t len;
+};
+
+static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
+{
+ size_t realsize = size * nmemb;
+ struct ucontent *mem = (struct ucontent *)userp;
+
+ mem->data = realloc(mem->data, mem->len + realsize + 1);
+
+ memcpy(&(mem->data[mem->len]), buffer, realsize);
+ mem->len += realsize;
+ mem->data[mem->len] = 0;
+
+ return realsize;
+}
+
+static void init()
+{
+ if (!curl) {
+ log_debug(_("initializing CURL"));
+ curl_global_init(CURL_GLOBAL_ALL);
+ curl = curl_easy_init();
+ }
+
+ if (!curl)
+ exit(EXIT_FAILURE);
+}
+
+static char *fetch_url(const char *url)
+{
+ struct ucontent *content = malloc(sizeof(struct ucontent));
+ char *result;
+ long code;
+ int retries;
+ unsigned int s;
+
+ log_debug(_("fetch_url(): %s"), url);
+
+ init();
+
+ result = NULL;
+
+ retries = DEFAULT_FETCH_RETRIES;
+
+ retrieve:
+ content->data = malloc(1);
+ content->data[0] = '\0';
+ content->len = 0;
+
+ curl_easy_setopt(curl, CURLOPT_URL, url);
+ curl_easy_setopt(curl, CURLOPT_VERBOSE, 0);
+ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl);
+ curl_easy_setopt(curl, CURLOPT_WRITEDATA, content);
+ curl_easy_setopt(curl, CURLOPT_USERAGENT, "ppastats/0.0");
+
+ if (curl_easy_perform(curl) == CURLE_OK) {
+ curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
+
+ switch (code) {
+ case 200:
+ result = content->data;
+ break;
+ case 500:
+ case 502:
+ case 503:
+ case 504:
+ log_err(_("Fetch failed with code %ld for URL %s"),
+ code,
+ url);
+
+ if (retries) {
+ s = 2 * (DEFAULT_FETCH_RETRIES - retries) + 2;
+ log_debug(_("Wait %ds before retry"), s);
+ sleep(s);
+
+ free(content->data);
+ retries--;
+ goto retrieve;
+ }
+
+ break;
+ default:
+ log_err(_("Fetch failed with code %ld for URL %s"),
+ code,
+ url);
+ }
+ }
+
+ if (!result)
+ free(content->data);
+
+ free(content);
+
+ return result;
+}
+
+void http_cleanup()
+{
+ log_debug(_("cleanup CURL"));
+
+ curl_easy_cleanup(curl);
+ curl_global_cleanup();
+}
+
+char *get_url_content(const char *url, unsigned int use_cache)
+{
+ char *content;
+
+ content = NULL;
+
+ if (use_cache)
+ content = fcache_get(url + 7);
+
+ if (!content) {
+ content = fetch_url(url);
+ }
+
+ if (use_cache && content)
+ fcache_put(url + 7, content);
+
+ return content;
+}
+
--- /dev/null
+/*
+ * Copyright (C) 2011-2012 jeanfi@gmail.com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#ifndef _PPASTATS_HTTP_H_
+#define _PPASTATS_HTTP_H_
+
+char *get_url_content(const char *url, unsigned int use_cache);
+
+void http_cleanup();
+
+#endif
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include <curl/curl.h>
#include <json/json.h>
#include "cache.h"
#include "fcache.h"
+#include "http.h"
#include "list.h"
#include "log.h"
#include "lp_ws.h"
static const char *
QUERY_GET_DAILY_DOWNLOAD_TOTALS = "?ws.op=getDailyDownloadTotals";
-static const int DEFAULT_FETCH_RETRIES = 10;
-
-static CURL *curl;
-
-struct ucontent {
- char *data;
- size_t len;
-};
-
-static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
-{
- size_t realsize = size * nmemb;
- struct ucontent *mem = (struct ucontent *)userp;
-
- mem->data = realloc(mem->data, mem->len + realsize + 1);
-
- memcpy(&(mem->data[mem->len]), buffer, realsize);
- mem->len += realsize;
- mem->data[mem->len] = 0;
-
- return realsize;
-}
-
-static void init()
-{
- if (!curl) {
- log_debug(_("initializing CURL"));
- curl_global_init(CURL_GLOBAL_ALL);
- curl = curl_easy_init();
- }
-
- if (!curl)
- exit(EXIT_FAILURE);
-}
-
-static char *fetch_url(const char *url)
-{
- struct ucontent *content = malloc(sizeof(struct ucontent));
- char *result;
- long code;
- int retries;
- unsigned int s;
-
- log_debug(_("fetch_url(): %s"), url);
-
- init();
-
- result = NULL;
-
- retries = DEFAULT_FETCH_RETRIES;
-
- retrieve:
- content->data = malloc(1);
- content->data[0] = '\0';
- content->len = 0;
-
- curl_easy_setopt(curl, CURLOPT_URL, url);
- curl_easy_setopt(curl, CURLOPT_VERBOSE, 0);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, cbk_curl);
- curl_easy_setopt(curl, CURLOPT_WRITEDATA, content);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, "ppastats/0.0");
-
- if (curl_easy_perform(curl) == CURLE_OK) {
- curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code);
-
- switch (code) {
- case 200:
- result = content->data;
- break;
- case 500:
- case 502:
- case 503:
- case 504:
- log_err(_("Fetch failed with code %ld for URL %s"),
- code,
- url);
-
- if (retries) {
- s = 2 * (DEFAULT_FETCH_RETRIES - retries) + 2;
- log_debug(_("Wait %ds before retry"), s);
- sleep(s);
-
- free(content->data);
- retries--;
- goto retrieve;
- }
-
- break;
- default:
- log_err(_("Fetch failed with code %ld for URL %s"),
- code,
- url);
- }
- }
-
- if (!result)
- free(content->data);
-
- free(content);
-
- return result;
-}
-
static json_object *get_json_object(const char *url)
{
json_object *obj = NULL;
char *body;
- body = fetch_url(url);
+ body = get_url_content(url, 0);
if (body) {
obj = json_tokener_parse(body);
if (distro)
return (struct distro_arch_series *)distro;
- content = fcache_get(url + 7);
- if (!content) {
- content = fetch_url(url);
- if (content)
- fcache_put(url + 7, content);
- else
- return NULL;
- }
+ content = get_url_content(url, 1);
+
+ if (!content)
+ return NULL;
obj = json_tokener_parse(content);
{
json_object *obj;
const struct distro_series *distro;
+ char *content;
distro = cache_get(url);
if (distro)
return (struct distro_series *)distro;
- obj = get_json_object(url);
+ content = get_url_content(url, 1);
+
+ if (!content)
+ return NULL;
+
+ obj = json_tokener_parse(content);
+
+ free(content);
if (!obj)
return NULL;
return result;
}
-void lp_ws_cleanup()
-{
- log_debug(_("cleanup CURL"));
-
- curl_easy_cleanup(curl);
- curl_global_cleanup();
-}
#include "cache.h"
#include "html.h"
+#include "http.h"
#include "log.h"
#include "lp_ws.h"
#include "config.h"
/* for valgrind.... */
free(package_status);
free(output_dir);
- lp_ws_cleanup();
+ http_cleanup();
cache_cleanup();
exit(EXIT_SUCCESS);
projects / ppastats.git / commitdiff