More crash-resistant on network failure (patch from Lekensteyn)

[ppastats.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 1997551..94cf696 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -86,9 +86,10 @@ static void display_published_binaries(const char *owner,
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
-       {"html", no_argument, 0, 't'},
+       {"output-dir", required_argument, 0, 'o'},
        {"debug", no_argument, 0, 'd'},
        {"status", required_argument, 0, 's'},
+       {"skip-js-css", no_argument, 0, 'S'},
        {0, 0, 0, 0}
 };
 
@@ -100,7 +101,7 @@ License GPLv2: GNU GPL version 2 or later \
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n\
 This is free software: you are free to change and redistribute it.\n\
 There is NO WARRANTY, to the extent permitted by law.\n",
-              "2010-2011");
+              "2011");
 }
 
 static void print_help()
@@ -122,9 +123,16 @@ static void print_help()
        puts("");
 
        puts("\
-  -t, --html       \
-generates an HTML output.");
+  -o, --output-dir=[PATH]       \
+generates HTML pages into 'PATH'.");
 
+       puts("\
+  -s, --status=[STATUS]                retrieves only package of the given status\n\
+                               (possible values are: Pending, Published, \n\
+                               Superseded, Deleted or Obsolete).");
+
+       puts("\
+  -S, --skip-js-css            skip installation of js and css files");
        puts("");
 
        printf("Report bugs to: %s\n", PACKAGE_BUGREPORT);
@@ -140,14 +148,17 @@ int main(int argc, char **argv)
        int output_html = 0;
        char *package_status = NULL;
        int cmdok = 1;
+       char *output_dir = NULL;
+       int install_static_files = 1;
 
        program_name = argv[0];
 
-       while ((optc = getopt_long(argc, argv, "vhtds:", long_options,
+       while ((optc = getopt_long(argc, argv, "vho:ds:S", long_options,
                                   NULL)) != -1) {
                switch (optc) {
-               case 't':
+               case 'o':
                        output_html = 1;
+                       output_dir = strdup(optarg);
                        break;
                case 'd':
                        debug = 1;
@@ -162,6 +173,9 @@ int main(int argc, char **argv)
                        if (optarg)
                                package_status = strdup(optarg);
                        break;
+               case 'S':
+                       install_static_files = 0;
+                       break;
                default:
                        cmdok = 0;
                        break;
@@ -178,12 +192,14 @@ int main(int argc, char **argv)
        ppa = argv[optind+1];
 
        if (output_html)
-               ppa_to_html(owner, ppa, package_status);
+               ppa_to_html(owner, ppa, package_status, output_dir,
+                           install_static_files);
        else
                display_published_binaries(owner, ppa, package_status);
 
        /* for valgrind.... */
        free(package_status);
+       free(output_dir);
        lp_ws_cleanup();
        cache_cleanup();