X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fppastats.c;h=39b2d874daa7b740b1e0dd4306654defc8ac07b8;hb=586361f5da21ef8e34987db0c628af1fb06df6a1;hp=7861301217c7ff23f3f02aedc024844e174541c7;hpb=49b52ead6d48488a4c1f90f372564c834da803cb;p=ppastats.git

diff --git a/src/ppastats.c b/src/ppastats.c
index 7861301..39b2d87 100644
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -1,21 +1,21 @@
 /*
-    Copyright (C) 2011 jeanfi@gmail.com
+  Copyright (C) 2011-2014 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 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.
+  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
-*/
+  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)
@@ -24,16 +24,109 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "list.h"
-#include "log.h"
-#include "lp_ws.h"
-#include "ppastats.h"
+#include <list.h>
+#include <lp_ws.h>
+#include <plog.h>
+#include <ppastats.h>
+
+static void arch_stats_free(struct arch_stats *arch)
+{
+	free(arch->name);
+	free(arch);
+}
+
+static struct distro_stats *distro_stats_new(const char *name)
+{
+	struct distro_stats *d;
+
+	d = malloc(sizeof(struct distro_stats));
+	d->name = strdup(name);
+	d->archs = NULL;
+	d->download_count = 0;
+	d->ddts = NULL;
+
+	return d;
+}
+
+static void distro_stats_free(struct distro_stats *distro)
+{
+	struct arch_stats **archs;
+
+	archs = distro->archs;
+	if (archs) {
+		while (*archs) {
+			arch_stats_free(*archs);
+			archs++;
+		}
+		free(distro->archs);
+	}
+
+	daily_download_total_list_free(distro->ddts);
+
+	free(distro->name);
+	free(distro);
+}
+
+static void distro_stats_list_free(struct distro_stats **distros)
+{
+	struct distro_stats **cur;
+
+	if (distros) {
+		cur = distros;
+		while (*cur) {
+			distro_stats_free(*cur);
+			cur++;
+		}
+		free(distros);
+	}
+}
+
+static void version_stats_free(struct version_stats *version)
+{
+	distro_stats_list_free(version->distros);
+	daily_download_total_list_free(version->daily_download_totals);
+
+	free(version->version);
+	free(version);
+}
+
+static void package_stats_free(struct package_stats *package)
+{
+	struct version_stats **versions;
+
+	versions = package->versions;
+	if (versions) {
+		while (*versions) {
+			version_stats_free(*versions);
+			versions++;
+		}
+		free(package->versions);
+	}
+	distro_stats_list_free(package->distros);
+	daily_download_total_list_free(package->daily_download_totals);
+	free(package->name);
+	free(package);
+}
+
+static struct package_stats *package_stats_new(const char *name)
+{
+	struct package_stats *p;
+
+	p = malloc(sizeof(struct package_stats));
+	p->name = strdup(name);
+	p->versions = NULL;
+	p->download_count = 0;
+	p->daily_download_totals = NULL;
+	p->distros = NULL;
+
+	return p;
+}
 
 static struct package_stats *get_package_stats(struct ppa_stats *stats,
 					       const char *name)
 
 {
-	struct package_stats *p, **p_cur;
+	struct package_stats *p, **p_cur, **tmp;
 
 	p_cur = stats->packages;
 	while (p_cur && *p_cur) {
@@ -45,23 +138,33 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
 		p_cur++;
 	}
 
-	p = malloc(sizeof(struct package_stats));
-	p->name = strdup(name);
-	p->versions = NULL;
-	p->download_count = 0;
-	p->daily_download_totals = NULL;
-	p->distros = NULL;
+	p = package_stats_new(name);
 
-	stats->packages = (struct package_stats **)list_add
-		((void **)stats->packages, p);
+	tmp = (struct package_stats **)list_add((void **)stats->packages, p);
+	free(stats->packages);
+	stats->packages = tmp;
 
 	return p;
 }
 
+static struct version_stats *version_stats_new(const char *version)
+{
+	struct version_stats *v;
+
+	v = malloc(sizeof(struct version_stats));
+	v->version = strdup(version);
+	v->distros = NULL;
+	v->download_count = 0;
+	v->daily_download_totals = NULL;
+	v->date_created = 0;
+
+	return v;
+}
+
 static struct version_stats *get_version_stats(struct package_stats *package,
 					       const char *version)
 {
-	struct version_stats *v, **cur;
+	struct version_stats *v, **cur, **tmp;
 
 	cur = package->versions;
 	while (cur && *cur) {
@@ -73,37 +176,22 @@ static struct version_stats *get_version_stats(struct package_stats *package,
 		cur++;
 	}
 
-	v = malloc(sizeof(struct version_stats));
-	v->version = strdup(version);
-	v->distros = NULL;
-	v->download_count = 0;
-	v->daily_download_totals = NULL;
+	v = version_stats_new(version);
 
-	package->versions
-		= (struct version_stats **)list_add((void **)package->versions,
-						    v);
+	tmp = (struct version_stats **)list_add((void **)package->versions,
+						v);
+	free((void **)package->versions);
+	package->versions = tmp;
 
 	return v;
 }
 
-static struct distro_stats *distro_stats_new(const char *name)
-{
-	struct distro_stats *d;
-
-	d = malloc(sizeof(struct distro_stats));
-	d->name = strdup(name);
-	d->archs = NULL;
-	d->download_count = 0;
-	d->ddts = NULL;
-
-	return d;
-}
-
 static struct distro_stats *get_distro_stats(struct version_stats *version,
 					     const char *name)
 {
-	struct distro_stats **cur = version->distros;
-	struct distro_stats *d;
+	struct distro_stats **cur, *d, **tmp;
+
+	cur = version->distros;
 
 	while (cur && *cur) {
 		d = *cur;
@@ -116,9 +204,10 @@ static struct distro_stats *get_distro_stats(struct version_stats *version,
 
 	d = distro_stats_new(name);
 
-	version->distros
-		= (struct distro_stats **)list_add((void **)version->distros,
-						   d);
+	tmp = (struct distro_stats **)list_add((void **)version->distros,
+					       d);
+	free(version->distros);
+	version->distros = tmp;
 
 	return d;
 }
@@ -126,9 +215,9 @@ static struct distro_stats *get_distro_stats(struct version_stats *version,
 static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 					 const char *name)
 {
-	struct arch_stats **cur = distro->archs;
-	struct arch_stats *a;
+	struct arch_stats **cur, *a, **tmp;
 
+	cur = distro->archs;
 	while (cur && *cur) {
 		a = *cur;
 
@@ -142,9 +231,10 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 	a->name = strdup(name);
 	a->download_count = 0;
 
-	distro->archs
-		= (struct arch_stats **)list_add((void **)distro->archs,
-						 a);
+	tmp = (struct arch_stats **)list_add((void **)distro->archs,
+					     a);
+	free((void **)distro->archs);
+	distro->archs = tmp;
 
 	return a;
 }
@@ -153,8 +243,7 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 static struct daily_download_total **add_total
 (struct daily_download_total **totals, struct daily_download_total *total)
 {
-	struct daily_download_total **cur;
-	struct daily_download_total *item;
+	struct daily_download_total **cur, **result, *item;
 
 	if (totals) {
 		cur = totals;
@@ -172,24 +261,23 @@ static struct daily_download_total **add_total
 		}
 	}
 
-	item = malloc(sizeof(struct daily_download_total));
-	memcpy(item, total, sizeof(struct daily_download_total));
-
-	return (struct daily_download_total **)
-		list_add((void **)totals, (void *)item);
+	result = (struct daily_download_total **)list_add((void **)totals,
+							  ddt_clone(total));
+	return result;
 }
 
-struct daily_download_total **add_totals
+static struct daily_download_total **add_totals
 (struct daily_download_total **total1, struct daily_download_total **total2)
 {
-	struct daily_download_total **cur;
-	struct daily_download_total **result;
+	struct daily_download_total **cur, **result, **tmp;
 
 	result = total1;
 	cur = total2;
 	while (*cur) {
-		result = add_total(result, *cur);
-
+		tmp = add_total(result, *cur);
+		if (result != total1 && result != tmp)
+			free(result);
+		result = tmp;
 		cur++;
 	}
 
@@ -202,7 +290,8 @@ pkg_add_distro(struct package_stats *pkg,
 	       int distro_count,
 	       struct daily_download_total **ddts)
 {
-	struct distro_stats **pkg_distros, *pkg_distro;
+	struct distro_stats **pkg_distros, *pkg_distro, **tmp;
+	struct daily_download_total **tmp_ddts;
 
 	pkg_distros = pkg->distros;
 	pkg_distro = NULL;
@@ -219,22 +308,43 @@ pkg_add_distro(struct package_stats *pkg,
 
 	if (!pkg_distro) {
 		pkg_distro = distro_stats_new(distro_name);
-		pkg->distros
-			= (struct distro_stats **)
-			list_add((void **)pkg->distros, (void *)pkg_distro);
+		tmp = (struct distro_stats **)list_add((void **)pkg->distros,
+						       (void *)pkg_distro);
+		if (pkg->distros != tmp)
+			free(pkg->distros);
+		pkg->distros = tmp;
 	}
 
 	pkg_distro->download_count += distro_count;
-	pkg_distro->ddts = add_totals(pkg_distro->ddts, ddts);
+
+	tmp_ddts = add_totals(pkg_distro->ddts, ddts);
+	if (pkg_distro->ddts && pkg_distro->ddts != tmp_ddts)
+		free(pkg_distro->ddts);
+	pkg_distro->ddts = tmp_ddts;
+}
+
+static struct ppa_stats *ppa_stats_new(const char *owner, const char *ppa_name)
+{
+	struct ppa_stats *ppa;
+
+	ppa = malloc(sizeof(struct ppa_stats));
+	ppa->name = strdup(ppa_name);
+	ppa->owner = strdup(owner);
+	ppa->packages = NULL;
+	ppa->daily_download_totals = NULL;
+	ppa->download_count = 0;
+
+	return ppa;
 }
 
 struct ppa_stats *
 create_ppa_stats(const char *owner,
 		 const char *ppa_name,
-		 const char *package_status)
+		 const char *package_status,
+		 int ws_size)
 {
 	struct ppa_stats *ppa;
-	struct binary_package_publishing_history **history, **h_cur, *h;
+	struct bpph **history, **h_cur, *h;
 	char *ppa_url, *pkg_name, *pkg_version;
 	struct package_stats *pkg;
 	struct version_stats *version;
@@ -243,11 +353,10 @@ create_ppa_stats(const char *owner,
 	struct distro_stats *distro;
 	struct arch_stats *arch;
 	int count;
-	struct daily_download_total **totals;
+	struct daily_download_total **totals, **tmp;
 
 	ppa_url = get_archive_url(owner, ppa_name);
-	history = get_binary_package_publishing_history_list(ppa_url,
-							     package_status);
+	history = get_bpph_list(ppa_url, package_status, ws_size);
 	free(ppa_url);
 
 	if (!history) {
@@ -255,27 +364,18 @@ create_ppa_stats(const char *owner,
 		exit(EXIT_FAILURE);
 	}
 
-	ppa = malloc(sizeof(struct ppa_stats));
-	ppa->name = strdup(ppa_name);
-	ppa->owner = strdup(owner);
-	ppa->packages = NULL;
-	ppa->daily_download_totals = NULL;
-	ppa->download_count = 0;
+	ppa = ppa_stats_new(owner, ppa_name);
 
 	for (h_cur = history; *h_cur; ++h_cur) {
 		h = *h_cur;
-		totals = get_daily_download_totals(h->self_link);
+		totals = get_daily_download_totals(h->self_link,
+						   h->date_created);
 		if (!totals) {
 			log_err(_("Failed to retrieve download totals for %s"),
 				h->self_link);
 			continue;
 		}
-		count = get_download_count(h->self_link);
-		if (count == -1) {
-			log_err(_("Failed to retrieve download count for %s"),
-				h->self_link);
-			count = 0;
-		}
+		count = ddts_get_count(totals);
 		pkg_name = h->binary_package_name;
 		pkg_version = h->binary_package_version;
 		arch_series
@@ -284,18 +384,26 @@ create_ppa_stats(const char *owner,
 			= get_distro_series(arch_series->distroseries_link);
 
 		ppa->download_count += count;
-		ppa->daily_download_totals
-			= add_totals(ppa->daily_download_totals, totals);
+		tmp = add_totals(ppa->daily_download_totals, totals);
+		if (ppa->daily_download_totals != tmp)
+			free(ppa->daily_download_totals);
+		ppa->daily_download_totals = tmp;
 
 		pkg = get_package_stats(ppa, pkg_name);
 		pkg->download_count += count;
-		pkg->daily_download_totals
-			= add_totals(pkg->daily_download_totals, totals);
+		tmp = add_totals(pkg->daily_download_totals, totals);
+		if (pkg->daily_download_totals != tmp)
+			free(pkg->daily_download_totals);
+		pkg->daily_download_totals = tmp;
 
 		version = get_version_stats(pkg, pkg_version);
+		version->date_created = h->date_created;
+
 		version->download_count += count;
-		version->daily_download_totals
-			= add_totals(version->daily_download_totals, totals);
+		tmp = add_totals(version->daily_download_totals, totals);
+		if (version->daily_download_totals != tmp)
+			free(version->daily_download_totals);
+		version->daily_download_totals = tmp;
 
 		distro = get_distro_stats(version, distro_series->name);
 		distro->download_count += count;
@@ -308,68 +416,11 @@ create_ppa_stats(const char *owner,
 		daily_download_total_list_free(totals);
 	}
 
-	binary_package_publishing_history_list_free(history);
+	bpph_list_free(history);
 
 	return ppa;
 }
 
-static void arch_stats_free(struct arch_stats *arch)
-{
-	free(arch->name);
-	free(arch);
-}
-
-static void distro_stats_free(struct distro_stats *distro)
-{
-	struct arch_stats **archs;
-
-	archs = distro->archs;
-	if (archs) {
-		while (*archs) {
-			arch_stats_free(*archs);
-			archs++;
-		}
-		free(distro->archs);
-	}
-
-	free(distro->name);
-	free(distro);
-}
-
-static void version_stats_free(struct version_stats *version)
-{
-	struct distro_stats **distros;
-
-	distros = version->distros;
-	if (distros) {
-		while (*distros) {
-			distro_stats_free(*distros);
-			distros++;
-		}
-		free(version->distros);
-	}
-
-	free(version->version);
-	free(version);
-}
-
-static void package_stats_free(struct package_stats *package)
-{
-	struct version_stats **versions;
-
-	versions = package->versions;
-	if (versions) {
-		while (*versions) {
-			version_stats_free(*versions);
-			versions++;
-		}
-		free(package->versions);
-	}
-
-	free(package->name);
-	free(package);
-}
-
 void ppa_stats_free(struct ppa_stats *ppastats)
 {
 	struct package_stats **packages;