improved output

[ppastats.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index bf46ab2..662a87e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/*
+/*a
     Copyright (C) 2011 jeanfi@gmail.com
 
     This program is free software; you can redistribute it and/or modify
@@ -22,48 +22,70 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "cache.h"
 #include "html.h"
 #include "lp_ws.h"
 #include "config.h"
+#include "ppastats.h"
 
+int debug;
 static const char *program_name;
 
 static void display_published_binaries(const char *owner, const char *ppa)
 {
-       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);
+       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);
 
-       e_cur = list;
-       while (*e_cur) {
-               struct binary_package_publishing_history *binary;
-               struct distro_arch_series *dist;
+                               archs = (*distros)->archs;
 
-               binary = *e_cur;
-               dist = get_distro_arch_series(binary->distro_arch_series_link);
+                               while (*archs) {
+                                       printf("\t\t\t%s (%d)\n",
+                                              (*archs)->name,
+                                              (*archs)->download_count);
 
-               printf("%s %s %s %d\n",
-                      dist->display_name,
-                      binary->binary_package_name,
-                      binary->binary_package_version,
-                      get_download_count(binary->self_link));
-               e_cur++;
+                                       archs++;
+                               }
+
+                               distros++;
+                       }
+
+                       versions++;
+               }
+
+               packages++;
        }
 
-       binary_package_publishing_history_list_free(list);
+       ppa_stats_free(ppastats);
 }
 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"html", no_argument, 0, 't'},
+       {"debug", no_argument, 0, 'd'},
        {0, 0, 0, 0}
 };
 
@@ -83,10 +105,10 @@ static void print_help()
        printf("Usage: %s [OPTION]... PPA_OWNER PPA_NAME\n", program_name);
 
        puts("ppastats is a command application"
-            " for generating PPA statistics.");
+            " for generating PPA statistics.\n");
 
        puts("Prints number of downloads for each published packages of a PPA "
-            "or generates an HTML containing a graph representation.");
+            "or generates an HTML page containing a graph representation.");
 
        puts("");
        puts("Options:");
@@ -117,12 +139,15 @@ int main(int argc, char **argv)
 
        program_name = argv[0];
 
-       while ((optc = getopt_long(argc, argv, "vht", long_options,
+       while ((optc = getopt_long(argc, argv, "vhtd", long_options,
                                   NULL)) != -1) {
                switch (optc) {
                case 't':
                        output_html = 1;
                        break;
+               case 'd':
+                       debug = 1;
+                       break;
                case 'h':
                        print_help();
                        exit(EXIT_SUCCESS);
@@ -149,5 +174,9 @@ int main(int argc, char **argv)
        else
                display_published_binaries(owner, ppa);
 
+       /* for valgrind.... */
+       lp_ws_cleanup();
+       cache_cleanup();
+
        exit(EXIT_SUCCESS);
 }