1 files changed, 68 insertions, 43 deletions

diff --git a/src/fs/gnunet-download.c b/src/fs/gnunet-download.c
index 5279ce459..63895d4b2 100644
--- a/src/fs/gnunet-download.c
+++ b/src/fs/gnunet-download.c
@@ -26,7 +26,7 @@
  * @author Igor Wronsky
  *
  * TODO:
- * - many command-line options
+ * - download-directory option support (do_directory)
  */
 #include "platform.h"
 #include "gnunet_fs_service.h"
@@ -47,6 +47,12 @@ static struct GNUNET_FS_DownloadContext *dc;
 
 static unsigned int anonymity = 1;
 
+static unsigned int parallelism = 16;
+
+static int do_recursive;
+
+static int do_directory;
+
 static char *filename;
 
 
@@ -127,8 +133,15 @@ progress_cb (void *cls,
                info->value.download.filename,
                s);
       GNUNET_free (s);
-      if (info->value.download.dc == dc)
-        GNUNET_SCHEDULER_shutdown (sched);
+      if (do_directory)
+        {
+          GNUNET_break (0); //FIXME: not implemented
+        }
+      else
+        {
+          if (info->value.download.dc == dc)
+            GNUNET_SCHEDULER_shutdown (sched);
+        }
       break;
     case GNUNET_FS_STATUS_DOWNLOAD_STOPPED: 
       if (info->value.download.dc == dc)
@@ -168,25 +181,31 @@ run (void *cls,
   enum GNUNET_FS_DownloadOptions options;
 
   sched = s;
-  /* FIXME: check arguments */
-  uri = GNUNET_FS_uri_parse (args[0],
-                             &emsg);
-  if (NULL == uri)
+  if (do_directory)
     {
-      fprintf (stderr,
-               _("Failed to parse URI: %s\n"),
-               emsg);
-      GNUNET_free (emsg);
-      ret = 1;
-      return;
+      GNUNET_break (0); //FIXME: not implemented    
     }
-  if (! GNUNET_FS_uri_test_chk (uri))
+  else
     {
-      fprintf (stderr,
-               "Only CHK URIs supported right now.\n");
-      ret = 1;
-      GNUNET_FS_uri_destroy (uri);
-      return;            
+      uri = GNUNET_FS_uri_parse (args[0],
+                                 &emsg);
+      if (NULL == uri)
+        {
+          fprintf (stderr,
+                   _("Failed to parse URI: %s\n"),
+                   emsg);
+          GNUNET_free (emsg);
+          ret = 1;
+          return;
+        }
+      if (! GNUNET_FS_uri_test_chk (uri))
+        {
+          fprintf (stderr,
+                   "Only CHK URIs supported right now.\n");
+          ret = 1;
+          GNUNET_FS_uri_destroy (uri);
+          return;                
+        }
     }
   if (NULL == filename)
     {
@@ -203,6 +222,8 @@ run (void *cls,
                          &progress_cb,
                          NULL,
                          GNUNET_FS_FLAGS_NONE,
+                         GNUNET_FS_OPTIONS_DOWNLOAD_PARALLELISM,
+                         parallelism,
                          GNUNET_FS_OPTIONS_END);
   if (NULL == ctx)
     {
@@ -214,22 +235,31 @@ run (void *cls,
       return;
     }
   options = GNUNET_FS_DOWNLOAD_OPTION_NONE;
-  dc = GNUNET_FS_download_start (ctx,
-                                 uri,
-                                 NULL,
-                                 filename,
-                                 0,
-                                 GNUNET_FS_uri_chk_get_file_size (uri),
-                                 anonymity,
-                                 options,
-                                 NULL,
-                                 NULL);
-  GNUNET_FS_uri_destroy (uri);
-  if (dc == NULL)
+  if (do_recursive)
+    options |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
+  if (do_directory)
     {
-      GNUNET_FS_stop (ctx);
-      ctx = NULL;
-      return;
+      GNUNET_break (0); //FIXME: not implemented
+    }
+  else
+    {  
+      dc = GNUNET_FS_download_start (ctx,
+                                     uri,
+                                     NULL,
+                                     filename,
+                                     0,
+                                     GNUNET_FS_uri_chk_get_file_size (uri),
+                                     anonymity,
+                                     options,
+                                     NULL,
+                                     NULL);
+      GNUNET_FS_uri_destroy (uri);
+      if (dc == NULL)
+        {
+          GNUNET_FS_stop (ctx);
+          ctx = NULL;
+          return;
+        }
     }
   GNUNET_SCHEDULER_add_delayed (sched,
                                 GNUNET_TIME_UNIT_FOREVER_REL,
@@ -245,28 +275,23 @@ 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},
+   0, &GNUNET_GETOPT_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
+   0, &GNUNET_GETOPT_set_one, &delete_incomplete},
   {'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},
+   1, &GNUNET_GETOPT_set_uint, &parallelism},
   {'R', "recursive", NULL,
    gettext_noop ("download a GNUnet directory recursively"),
-   0, &GNUNET_getopt_configure_set_one, &do_recursive},
-#endif
+   0, &GNUNET_GETOPT_set_one, &do_recursive},
   {'V', "verbose", NULL,
    gettext_noop ("be verbose (print progress information)"),
    0, &GNUNET_GETOPT_set_one, &verbose},