added inlt support

[ppastats.git] / src / ppastats.c

diff --git a/src/ppastats.c b/src/ppastats.c
index 9dd5c46..38f6dd0 100644 (file)
--- a/src/ppastats.c
+++ b/src/ppastats.c
@@ -46,6 +46,7 @@ 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
                ((void **)stats->packages, p);
@@ -81,6 +82,19 @@ static struct version_stats *get_version_stats(struct package_stats *package,
        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)
 {
@@ -96,10 +110,7 @@ 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 = distro_stats_new(name);
 
        version->distros
                = (struct distro_stats **)list_add((void **)version->distros,
@@ -181,6 +192,38 @@ struct daily_download_total **add_totals
        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;
+
+       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);
+               pkg->distros
+                       = (struct distro_stats **)
+                       list_add((void **)pkg->distros, (void *)pkg_distro);
+       }
+
+       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_name,
@@ -215,11 +258,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) {
+                       fprintf(stderr, "Failed to retrieve download totals"
+                               " for %s\n", h->self_link);
+                       continue;
+               }
                count = get_download_count(h->self_link);
+               if (count == -1) {
+                       fprintf(stderr, "Failed to retrieve download count"
+                               " for %s\n", h->self_link);
+                       count = 0;
+               }
                pkg_name = h->binary_package_name;
                pkg_version = h->binary_package_version;
                arch_series
@@ -247,9 +299,9 @@ create_ppa_stats(const char *owner,
                arch = get_arch_stats(distro, arch_series->architecture_tag);
                arch->download_count += count;
 
-               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);