X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ppastats.git;a=blobdiff_plain;f=src%2Fppastats.c;h=5fb0be11cbc28ee4202311ac169660ffd4bdb663;hp=70f6c6fa979d5ec00c05e75fb4fef2057082ca06;hb=0303d0d705cfc2a100403a708fca0e93b12d2a93;hpb=cacd81cd1065cf9a145bb2fbe66c383ad3c90206

diff --git a/src/ppastats.c b/src/ppastats.c
index 70f6c6f..5fb0be1 100644
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -1,21 +1,24 @@
 /*
-    Copyright (C) 2011 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
-*/
+ * 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 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 <stdio.h>
 #include <stdlib.h>
@@ -23,13 +26,14 @@
 
 #include "list.h"
 #include "lp_ws.h"
+#include <plog.h>
 #include "ppastats.h"
 
 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) {
@@ -46,9 +50,12 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
 	p->versions = NULL;
 	p->download_count = 0;
 	p->daily_download_totals = NULL;
+	p->distros = NULL;
 
-	stats->packages = (struct package_stats **)list_add
+	tmp = (struct package_stats **)list_add
 		((void **)stats->packages, p);
+	free(stats->packages);
+	stats->packages = tmp;
 
 	return p;
 }
@@ -56,7 +63,7 @@ static struct package_stats *get_package_stats(struct ppa_stats *stats,
 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) {
@@ -74,18 +81,33 @@ static struct version_stats *get_version_stats(struct package_stats *package,
 	v->download_count = 0;
 	v->daily_download_totals = NULL;
 
-	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 **tmp;
 
 	while (cur && *cur) {
 		d = *cur;
@@ -96,15 +118,13 @@ static struct distro_stats *get_distro_stats(struct version_stats *version,
 		cur++;
 	}
 
-	d = malloc(sizeof(struct distro_stats));
-	d->name = strdup(name);
-	d->archs = NULL;
-	d->download_count = 0;
-	d->daily_download_totals = NULL;
+	d = distro_stats_new(name);
 
-	version->distros
-		= (struct distro_stats **)list_add((void **)version->distros,
+
+	tmp = (struct distro_stats **)list_add((void **)version->distros,
 						   d);
+	free(version->distros);
+	version->distros = tmp;
 
 	return d;
 }
@@ -114,6 +134,7 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 {
 	struct arch_stats **cur = distro->archs;
 	struct arch_stats *a;
+	struct arch_stats **tmp;
 
 	while (cur && *cur) {
 		a = *cur;
@@ -126,77 +147,108 @@ static struct arch_stats *get_arch_stats(struct distro_stats *distro,
 
 	a = malloc(sizeof(struct arch_stats));
 	a->name = strdup(name);
-	a->daily_download_totals = NULL;
 	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;
 }
 
 
-static struct daily_download_total **
-add_total(struct daily_download_total **totals,
-	  struct daily_download_total *total)
+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 **cur, **result;
 	struct daily_download_total *item;
 
-	cur = totals;
-	while (*cur) {
-		item = *cur;
+	if (totals) {
+		cur = totals;
+		while (*cur) {
+			item = *cur;
+
+			if (item->date.tm_year == total->date.tm_year &&
+			    item->date.tm_mon == total->date.tm_mon &&
+			    item->date.tm_mday == total->date.tm_mday) {
+				item->count += total->count;
+				return totals;
+			}
 
-		if (item->date.tm_year == total->date.tm_year &&
-		    item->date.tm_mon == total->date.tm_mon &&
-		    item->date.tm_mday == total->date.tm_mday) {
-			item->count += total->count;
-			return totals;
+			cur++;
 		}
-		
-		cur++;
 	}
 
 	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,
+							  (void *)item);
+
+	free(totals);
+
+	return result;
 }
 
-struct daily_download_total **
-add_totals(struct daily_download_total **total1,
-	   struct daily_download_total **total2)
+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;
-
-	if (!total1)
-		return total2;
+	struct daily_download_total **cur, **result;
 
 	result = total1;
 	cur = total2;
 	while (*cur) {
 		result = add_total(result, *cur);
-
 		cur++;
 	}
 
 	return result;
 }
 
+static void
+pkg_add_distro(struct package_stats *pkg,
+	       const char *distro_name,
+	       int distro_count,
+	       struct daily_download_total **ddts)
+{
+	struct distro_stats **pkg_distros, *pkg_distro, **tmp;
+
+	pkg_distros = pkg->distros;
+	pkg_distro = NULL;
+
+	if (pkg_distros)
+		while (*pkg_distros)  {
+			if (!strcmp((*pkg_distros)->name, distro_name)) {
+				pkg_distro = *pkg_distros;
+				break;
+			}
+
+			pkg_distros++;
+		}
+
+	if (!pkg_distro) {
+		pkg_distro = distro_stats_new(distro_name);
+		tmp = (struct distro_stats **)list_add((void **)pkg->distros,
+						       (void *)pkg_distro);
+		free(pkg->distros);
+		pkg->distros = tmp;
+	}
+
+	pkg_distro->download_count += distro_count;
+	pkg_distro->ddts = add_totals(pkg_distro->ddts, ddts);
+}
+
 struct ppa_stats *
 create_ppa_stats(const char *owner,
-		 const char *ppa,
-		 const char *package_status)
+		 const char *ppa_name,
+		 const char *package_status,
+		 int ws_size)
 {
-	struct ppa_stats *ppastats;
-	struct binary_package_publishing_history **history;
-	struct binary_package_publishing_history **h_cur;
-	struct binary_package_publishing_history *h;
-	char *ppa_url, *package_name, *package_version;
-	struct package_stats *package;
+	struct ppa_stats *ppa;
+	struct bpph **history, **h_cur, *h;
+	char *ppa_url, *pkg_name, *pkg_version;
+	struct package_stats *pkg;
 	struct version_stats *version;
 	const struct distro_series *distro_series;
 	const struct distro_arch_series *arch_series;
@@ -205,40 +257,51 @@ create_ppa_stats(const char *owner,
 	int count;
 	struct daily_download_total **totals;
 
-	ppa_url = get_archive_url(owner, ppa);
-	history = get_binary_package_publishing_history_list(ppa_url,
-							     package_status);
+	ppa_url = get_archive_url(owner, ppa_name);
+	history = get_bpph_list(ppa_url, package_status, ws_size);
 	free(ppa_url);
 
 	if (!history) {
-		fprintf(stderr, "Failed to retrieve PPA information\n");
+		log_err(_("Failed to retrieve PPA information"));
 		exit(EXIT_FAILURE);
 	}
 
-	ppastats = malloc(sizeof(struct ppa_stats));
-	ppastats->name = strdup(ppa);
-	ppastats->owner = strdup(owner);
-	ppastats->packages = NULL;
-	ppastats->daily_download_totals = NULL;
-	ppastats->download_count = 0;
+	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;
 
-	h_cur = history;
-	while (*h_cur) {
+	for (h_cur = history; *h_cur; ++h_cur) {
 		h = *h_cur;
-		package_name = h->binary_package_name;
-		package_version = h->binary_package_version;
+		totals = get_daily_download_totals(h->self_link);
+		if (!totals) {
+			log_err(_("Failed to retrieve download totals for %s"),
+				h->self_link);
+			continue;
+		}
+		count = ddts_get_count(totals);
+		pkg_name = h->binary_package_name;
+		pkg_version = h->binary_package_version;
 		arch_series
 			= get_distro_arch_series(h->distro_arch_series_link);
 		distro_series
 			= get_distro_series(arch_series->distroseries_link);
 
-		count = get_download_count(h->self_link);
+		ppa->download_count += count;
+		ppa->daily_download_totals
+			= add_totals(ppa->daily_download_totals, totals);
 
-		package = get_package_stats(ppastats, package_name);
-		package->download_count += count;
+		pkg = get_package_stats(ppa, pkg_name);
+		pkg->download_count += count;
+		pkg->daily_download_totals
+			= add_totals(pkg->daily_download_totals, totals);
 
-		version = get_version_stats(package, package_version);
+		version = get_version_stats(pkg, pkg_version);
 		version->download_count += count;
+		version->daily_download_totals
+			= add_totals(version->daily_download_totals, totals);
 
 		distro = get_distro_stats(version, distro_series->name);
 		distro->download_count += count;
@@ -246,22 +309,14 @@ create_ppa_stats(const char *owner,
 		arch = get_arch_stats(distro, arch_series->architecture_tag);
 		arch->download_count += count;
 
-		ppastats->download_count += count;
-
-		totals = get_daily_download_totals(h->self_link);
-		ppastats->daily_download_totals 
-			= add_totals(ppastats->daily_download_totals,
-				     totals);
-
-		if (ppastats->daily_download_totals != totals)
-			daily_download_total_list_free(totals);
+		pkg_add_distro(pkg, distro_series->name, count, totals);
 
-		h_cur++;
+		daily_download_total_list_free(totals);
 	}
 
-	binary_package_publishing_history_list_free(history);
+	bpph_list_free(history);
 
-	return ppastats;
+	return ppa;
 }
 
 static void arch_stats_free(struct arch_stats *arch)
@@ -287,6 +342,16 @@ static void distro_stats_free(struct distro_stats *distro)
 	free(distro);
 }
 
+static void distro_stats_list_free(struct distro_stats **distros)
+{
+	if (distros) {
+		while (*distros) {
+			distro_stats_free(*distros);
+			distros++;
+		}
+	}
+}
+
 static void version_stats_free(struct version_stats *version)
 {
 	struct distro_stats **distros;
@@ -316,7 +381,7 @@ static void package_stats_free(struct package_stats *package)
 		}
 		free(package->versions);
 	}
-
+	distro_stats_list_free(package->distros);
 	free(package->name);
 	free(package);
 }
@@ -337,5 +402,7 @@ void ppa_stats_free(struct ppa_stats *ppastats)
 	free(ppastats->owner);
 	free(ppastats->name);
 
+	daily_download_total_list_free(ppastats->daily_download_totals);
+
 	free(ppastats);
 }