X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fppastats.c;h=0990e0fd8e8b9d5792a25880a3766db7f3468a41;hb=1a7e1ac9638c4e17a483b3f20886711679774a91;hp=aa07ba9fe51755b3e1861a419def0760624c720b;hpb=a7b62fd8f906191e2932a35dda971a07e057f292;p=ppastats.git diff --git a/src/ppastats.c b/src/ppastats.c index aa07ba9..0990e0f 100644 --- a/src/ppastats.c +++ b/src/ppastats.c @@ -29,6 +29,99 @@ #include #include +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) @@ -45,21 +138,29 @@ 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); - tmp = (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) { @@ -75,11 +176,7 @@ 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); tmp = (struct version_stats **)list_add((void **)package->versions, v); @@ -89,44 +186,6 @@ static struct version_stats *get_version_stats(struct package_stats *package, return v; } -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 struct distro_stats *get_distro_stats(struct version_stats *version, const char *name) { @@ -309,7 +368,7 @@ create_ppa_stats(const char *owner, 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); @@ -337,6 +396,8 @@ create_ppa_stats(const char *owner, pkg->daily_download_totals = tmp; version = get_version_stats(pkg, pkg_version); + version->date_created = h->date_created; + version->download_count += count; tmp = add_totals(version->daily_download_totals, totals); if (version->daily_download_totals != tmp) @@ -359,47 +420,6 @@ create_ppa_stats(const char *owner, return ppa; } -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); -} - void ppa_stats_free(struct ppa_stats *ppastats) { struct package_stats **packages;