added package status option

[ppastats.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 02861ea..1997551 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,39 +31,56 @@
 int debug;
 static const char *program_name;
 
-static void display_published_binaries(const char *owner, const char *ppa)
+static void display_published_binaries(const char *owner,
+                                      const char *ppa,
+                                      const char *package_status)
 {
-       struct binary_package_publishing_history **e_cur, **list;
-       char *archive_url = get_archive_url(owner, ppa);
+       struct ppa_stats *ppastats;
+       struct package_stats **packages;
+       struct version_stats **versions;
+       struct distro_stats **distros;
+       struct arch_stats **archs;
 
-       list = get_binary_package_publishing_history_list(archive_url);
-       free(archive_url);
+       ppastats = create_ppa_stats(owner, ppa, package_status);
+       packages = ppastats->packages;
+       while (packages && *packages) {
+               struct package_stats *p = *packages;
 
-       if (!list) {
-               fprintf(stderr, "Failed to retrieve PPA information\n");
-               exit(EXIT_FAILURE);
-       }
+               printf("%s (%d)\n", p->name, p->download_count);
+
+               versions = p->versions;
+
+               while (*versions) {
+                       printf("\t%s (%d)\n", (*versions)->version,
+                              (*versions)->download_count);
+
+                       distros = (*versions)->distros;
+
+                       while (*distros) {
+                               printf("\t\t%s (%d)\n",
+                                      (*distros)->name,
+                                      (*distros)->download_count);
+
+                               archs = (*distros)->archs;
 
-       e_cur = list;
-       while (*e_cur) {
-               struct binary_package_publishing_history *binary;
-               const struct distro_arch_series *arch;
-               const struct distro_series *distro;
-
-               binary = *e_cur;
-               arch = get_distro_arch_series(binary->distro_arch_series_link);
-               distro = get_distro_series(arch->distroseries_link);
-
-               printf("%s %s %s(%s): %d\n",
-                      binary->binary_package_name,
-                      binary->binary_package_version,
-                      distro->name,
-                      arch->architecture_tag,
-                      get_download_count(binary->self_link));
-               e_cur++;
+                               while (*archs) {
+                                       printf("\t\t\t%s (%d)\n",
+                                              (*archs)->name,
+                                              (*archs)->download_count);
+
+                                       archs++;
+                               }
+
+                               distros++;
+                       }
+
+                       versions++;
+               }
+
+               packages++;
        }
 
-       binary_package_publishing_history_list_free(list);
+       ppa_stats_free(ppastats);
 }
 
 static struct option long_options[] = {
@@ -71,6 +88,7 @@ static struct option long_options[] = {
        {"help", no_argument, 0, 'h'},
        {"html", no_argument, 0, 't'},
        {"debug", no_argument, 0, 'd'},
+       {"status", required_argument, 0, 's'},
        {0, 0, 0, 0}
 };
 
@@ -120,11 +138,12 @@ int main(int argc, char **argv)
        char *owner, *ppa;
        int optc;
        int output_html = 0;
+       char *package_status = NULL;
        int cmdok = 1;
 
        program_name = argv[0];
 
-       while ((optc = getopt_long(argc, argv, "vhtd", long_options,
+       while ((optc = getopt_long(argc, argv, "vhtds:", long_options,
                                   NULL)) != -1) {
                switch (optc) {
                case 't':
@@ -139,6 +158,10 @@ int main(int argc, char **argv)
                case 'v':
                        print_version();
                        exit(EXIT_SUCCESS);
+               case 's':
+                       if (optarg)
+                               package_status = strdup(optarg);
+                       break;
                default:
                        cmdok = 0;
                        break;
@@ -155,11 +178,12 @@ int main(int argc, char **argv)
        ppa = argv[optind+1];
 
        if (output_html)
-               ppa_to_html(owner, ppa);
+               ppa_to_html(owner, ppa, package_status);
        else
-               display_published_binaries(owner, ppa);
+               display_published_binaries(owner, ppa, package_status);
 
        /* for valgrind.... */
+       free(package_status);
        lp_ws_cleanup();
        cache_cleanup();