d->name = strdup(name);
d->archs = NULL;
d->download_count = 0;
- d->daily_download_totals = NULL;
version->distros
= (struct distro_stats **)list_add((void **)version->distros,
a = malloc(sizeof(struct arch_stats));
a->name = strdup(name);
- a->daily_download_totals = NULL;
a->download_count = 0;
distro->archs
}
+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;
+
+ 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;
+ }
+
+ 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);
+}
+
+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;
+
+ result = total1;
+ cur = total2;
+ while (*cur) {
+ result = add_total(result, *cur);
+
+ cur++;
+ }
+
+ return result;
+}
+
struct ppa_stats *
create_ppa_stats(const char *owner,
- const char *ppa,
+ const char *ppa_name,
const char *package_status)
{
- 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 binary_package_publishing_history **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;
struct distro_stats *distro;
struct arch_stats *arch;
int count;
+ struct daily_download_total **totals;
- ppa_url = get_archive_url(owner, ppa);
+ ppa_url = get_archive_url(owner, ppa_name);
history = get_binary_package_publishing_history_list(ppa_url,
package_status);
free(ppa_url);
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) {
h = *h_cur;
- package_name = h->binary_package_name;
- package_version = h->binary_package_version;
+ totals = get_daily_download_totals(h->self_link);
+ count = get_download_count(h->self_link);
+ 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;
arch = get_arch_stats(distro, arch_series->architecture_tag);
arch->download_count += count;
- ppastats->download_count += count;
+ daily_download_total_list_free(totals);
h_cur++;
}
binary_package_publishing_history_list_free(history);
- return ppastats;
+ return ppa;
}
static void arch_stats_free(struct arch_stats *arch)
free(ppastats->owner);
free(ppastats->name);
+ daily_download_total_list_free(ppastats->daily_download_totals);
+
free(ppastats);
}