X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fppastats.c;h=4232e5341765f75371b9e72e21f1479d638b2549;hb=b59ec44bffce28192c6408fed838c4d593a17c82;hp=fdcd6e1ffa34b56a44594d1089cd648e9c0ac2c4;hpb=a48a3dcf56462a9de729ee6e0bcbf789fe74d9cd;p=ppastats.git

diff --git a/src/ppastats.c b/src/ppastats.c
index fdcd6e1..4232e53 100644
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -1,27 +1,31 @@
 /*
-    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>
 #include <string.h>
 
 #include "list.h"
+#include "log.h"
 #include "lp_ws.h"
 #include "ppastats.h"
 
@@ -227,10 +231,11 @@ pkg_add_distro(struct package_stats *pkg,
 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;
@@ -242,12 +247,11 @@ create_ppa_stats(const char *owner,
 	struct daily_download_total **totals;
 
 	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) {
-		fprintf(stderr, "Failed to retrieve PPA information\n");
+		log_err(_("Failed to retrieve PPA information"));
 		exit(EXIT_FAILURE);
 	}
 
@@ -258,11 +262,20 @@ create_ppa_stats(const char *owner,
 	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;
 		totals = get_daily_download_totals(h->self_link);
+		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;
+		}
 		pkg_name = h->binary_package_name;
 		pkg_version = h->binary_package_version;
 		arch_series
@@ -293,11 +306,9 @@ create_ppa_stats(const char *owner,
 		pkg_add_distro(pkg, distro_series->name, count, totals);
 
 		daily_download_total_list_free(totals);
-
-		h_cur++;
 	}
 
-	binary_package_publishing_history_list_free(history);
+	bpph_list_free(history);
 
 	return ppa;
 }