fix

[oweals/gnunet.git] / src / fs / gnunet-download.c

diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index c865a33619a55e480dadb05df2d598ce3dcab81d..a171006cb57e1fb7e98662ba78f3534658d00bff 100644 (file)
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -24,9 +24,6 @@
  * @author Krista Bennett
  * @author James Blackwell
  * @author Igor Wronsky
- *
- * TODO:
- * - many command-line options
  */
 #include "platform.h"
 #include "gnunet_fs_service.h"
@@ -47,8 +44,15 @@ static struct GNUNET_FS_DownloadContext *dc;
 
 static unsigned int anonymity = 1;
 
+static unsigned int parallelism = 16;
+
+static unsigned int request_parallelism = 4092;
+
+static int do_recursive;
+
 static char *filename;
 
+static int local_only;
 
 static void
 cleanup_task (void *cls,
@@ -100,9 +104,9 @@ progress_cb (void *cls,
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
       if (verbose)
-       {
+       {         
          s = GNUNET_STRINGS_relative_time_to_string(info->value.download.eta);
-         t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000 / (info->value.download.duration.value + 1));
+         t = GNUNET_STRINGS_byte_size_fancy(info->value.download.completed * 1000LL / (info->value.download.duration.value + 1));
          fprintf (stdout,
                   _("Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"),
                   info->value.download.filename,
@@ -137,6 +141,9 @@ progress_cb (void *cls,
                                           NULL,
                                           GNUNET_SCHEDULER_REASON_PREREQ_DONE);
       break;      
+    case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
+    case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
+      break;
     default:
       fprintf (stderr,
               _("Unexpected status: %d\n"),
@@ -168,7 +175,6 @@ run (void *cls,
   enum GNUNET_FS_DownloadOptions options;
 
   sched = s;
-  /* FIXME: check arguments */
   uri = GNUNET_FS_uri_parse (args[0],
                             &emsg);
   if (NULL == uri)
@@ -203,6 +209,10 @@ run (void *cls,
                         &progress_cb,
                         NULL,
                         GNUNET_FS_FLAGS_NONE,
+                        GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
+                        parallelism,
+                        GNUNET_FS_OPTIONS_REQUEST_PARALLELISM,
+                        request_parallelism,
                         GNUNET_FS_OPTIONS_END);
   if (NULL == ctx)
     {
@@ -214,10 +224,14 @@ run (void *cls,
       return;
     }
   options = GNUNET_FS_DOWNLOAD_OPTION_NONE;
+  if (do_recursive)
+    options |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
+  if (local_only)
+    options |= GNUNET_FS_DOWNLOAD_OPTION_LOOPBACK_ONLY;
   dc = GNUNET_FS_download_start (ctx,
                                 uri,
                                 NULL,
-                                filename,
+                                filename, NULL,
                                 0,
                                 GNUNET_FS_uri_chk_get_file_size (uri),
                                 anonymity,
@@ -238,42 +252,6 @@ run (void *cls,
 }
 
 
-/**
- * gnunet-download command line options
- */
-static struct GNUNET_GETOPT_CommandLineOption options[] = {
-  {'a', "anonymity", "LEVEL",
-   gettext_noop ("set the desired LEVEL of receiver-anonymity"),
-   1, &GNUNET_GETOPT_set_uint, &anonymity},
-#if 0
-  // FIXME: options!
-  {'d', "directory", NULL,
-   gettext_noop
-   ("download a GNUnet directory that has already been downloaded.  Requires that a filename of an existing file is specified instead of the URI.  The download will only download the top-level files in the directory unless the `-R' option is also specified."),
-   0, &GNUNET_getopt_configure_set_one, &do_directory},
-  {'D', "delete-incomplete", NULL,
-   gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
-   0, &GNUNET_getopt_configure_set_one, &do_delete_incomplete},
-#endif
-  {'o', "output", "FILENAME",
-   gettext_noop ("write the file to FILENAME"),
-   1, &GNUNET_GETOPT_set_string, &filename},
-#if 0
-  {'p', "parallelism", "DOWNLOADS",
-   gettext_noop
-   ("set the maximum number of parallel downloads that are allowed"),
-   1, &GNUNET_getopt_configure_set_uint, &parallelism},
-  {'R', "recursive", NULL,
-   gettext_noop ("download a GNUnet directory recursively"),
-   0, &GNUNET_getopt_configure_set_one, &do_recursive},
-#endif
-  {'V', "verbose", NULL,
-   gettext_noop ("be verbose (print progress information)"),
-   0, &GNUNET_GETOPT_set_one, &verbose},
-  GNUNET_GETOPT_OPTION_END
-};
-
-
 /**
  * The main function to download GNUnet.
  *
@@ -284,6 +262,35 @@ static struct GNUNET_GETOPT_CommandLineOption options[] = {
 int
 main (int argc, char *const *argv)
 {
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+    {'a', "anonymity", "LEVEL",
+     gettext_noop ("set the desired LEVEL of receiver-anonymity"),
+     1, &GNUNET_GETOPT_set_uint, &anonymity},
+    {'D', "delete-incomplete", NULL,
+     gettext_noop ("delete incomplete downloads (when aborted with CTRL-C)"),
+     0, &GNUNET_GETOPT_set_one, &delete_incomplete},
+    {'n', "no-network", NULL,
+     gettext_noop ("only search the local peer (no P2P network search)"),
+     1, &GNUNET_GETOPT_set_uint, &local_only},
+    {'o', "output", "FILENAME",
+     gettext_noop ("write the file to FILENAME"),
+     1, &GNUNET_GETOPT_set_string, &filename},
+    {'p', "parallelism", "DOWNLOADS",
+     gettext_noop
+     ("set the maximum number of parallel downloads that is allowed"),
+     1, &GNUNET_GETOPT_set_uint, &parallelism},
+    {'r', "request-parallelism", "REQUESTS",
+     gettext_noop
+     ("set the maximum number of parallel requests for blocks that is allowed"),
+     1, &GNUNET_GETOPT_set_uint, &request_parallelism},
+    {'R', "recursive", NULL,
+     gettext_noop ("download a GNUnet directory recursively"),
+     0, &GNUNET_GETOPT_set_one, &do_recursive},
+    {'V', "verbose", NULL,
+     gettext_noop ("be verbose (print progress information)"),
+     0, &GNUNET_GETOPT_set_one, &verbose},
+    GNUNET_GETOPT_OPTION_END
+  };
   return (GNUNET_OK ==
           GNUNET_PROGRAM_run (argc,
                               argv,