1 files changed, 201 insertions, 17 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index aa870b0c..32852aef 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -596,6 +596,8 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
   guint applicability_rank;
   guint availability_certainty;
   gint availability_rank;
+  gchar *downloaded_filename;
+  gint downloaded_anonymity;
 
   if (TRUE == gtk_tree_model_iter_children (src_model, &src_child, src_iter))
   {
@@ -607,7 +609,8 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
                           &uri_as_string, 8, &status_colour, 9, &search_result,
                           10, &mimetype, 11, &applicability_rank, 12,
                           &availability_certainty, 13, &availability_rank, 14,
-                          &completed, -1);
+                          &completed, 15, &downloaded_filename, 16,
+                          &downloaded_anonymity, -1);
       gtk_tree_store_insert_with_values (GTK_TREE_STORE (dst_model), &dst_child,
                                          dst_iter, G_MAXINT, 0, meta, 1, uri, 2,
                                          filesize, 3, preview, 4,
@@ -617,8 +620,11 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
                                          search_result, 10, mimetype, 11,
                                          applicability_rank, 12,
                                          availability_certainty, 13,
-                                         availability_rank, 14, completed, -1);
+                                         availability_rank, 14, completed, 15,
+                                         downloaded_filename, 16,
+                                         downloaded_anonymity, -1);
       g_free (filename);
+      g_free (downloaded_filename);
       g_free (uri_as_string);
       g_free (status_colour);
       g_free (mimetype);
@@ -807,6 +813,164 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
   return de;
 }
 
+/**
+ * This should get the default download directory
+ * (so that GNUnet won't offer the user to download files
+ * to the 'bin' subdirectory, or whatever is the cwd).
+ * Returns NULL on failure (such as non-existend directory).
+ * Should also preserve the last setting (so if the user
+ * saves files somewhere else, next time we default to
+ * somewhere else, at least until application restart, or maybe even
+ * between application restarts).
+ * Fills the @buffer up to @size bytes, returns a pointer to it.
+ */
+static char *
+get_default_download_directory (char *buffer, size_t size)
+{
+  return NULL;
+}
+
+/**
+ * Called recursively to build a suggested filename by
+ * prepending suggested names for its parent directories (if any).
+ * Might return NULL. Returned name might be absolute.
+ * local_parents is set to GNUNET_YES if all parents are directories,
+ * and are downloaded.
+ */
+static char *
+get_suggested_filename_anonymity (GtkTreeModel *tm, GtkTreeIter *iter, int top,
+    int *local_parents, int *anonymity, int *filename_is_absolute)
+{
+  char *result;
+  char *dirname;
+  char *local_filename, *filename;
+  int downloaded_anonymity;
+  int have_a_parent;
+  struct GNUNET_CONTAINER_MetaData *meta;
+  GtkTreeIter parent;
+  gtk_tree_model_get (tm, iter, 0, &meta, 15, &local_filename, 16, &downloaded_anonymity, -1);
+  if (local_filename == NULL && !top)
+    *local_parents = GNUNET_NO;
+  if (downloaded_anonymity != -1 && *anonymity == -1 && !top)
+    *anonymity = downloaded_anonymity;
+  if (gtk_tree_model_iter_parent (tm, &parent, iter))
+  {
+    have_a_parent = GNUNET_YES;
+    dirname = get_suggested_filename_anonymity (tm, &parent, GNUNET_NO, local_parents, anonymity, filename_is_absolute);
+  }
+  else
+  {
+    have_a_parent = GNUNET_NO;
+    dirname = NULL;
+    if (top)
+      *local_parents = GNUNET_NO;
+  }
+  if (local_filename == NULL)
+    filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  else
+  {
+    /* This directory was downloaded as /foo/bar/baz/somedirname
+     * Hopefully, "somedirname" is actually "somedir.gnd"
+     * We need to strip the ".gnd" part to get "somedir", which is
+     * what we're going to use instead of suggested original filename
+     * Without the .gnd extension we're going to just use a copy
+     * of the directory file name - and that would fail. Sad.
+     */
+    const char *basename; 
+    if (dirname == NULL && !have_a_parent)
+    {
+      /* This is the ealderlest parent directory. Use absolute path. */
+      basename = (const char *) local_filename;
+      *filename_is_absolute = GNUNET_YES;
+    }
+    else
+      basename = GNUNET_STRINGS_get_short_name (local_filename);
+    if (basename != NULL && strlen (basename) > 0)
+    {
+      char *dot;
+      filename = GNUNET_strdup (basename);
+      dot = strrchr (filename, '.');
+      if (dot)
+        *dot = '\0';
+    }
+    else
+      filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  }
+  if (dirname && filename)
+  {
+    GNUNET_asprintf (&result, "%s%s%s", dirname, DIR_SEPARATOR_STR, filename);
+    GNUNET_free (filename);
+    GNUNET_free (dirname);
+    return result;
+  }
+  else if (filename)
+    return filename;
+  else
+    return NULL;
+}
+
+static void
+open_download_as_callback (struct DownloadContext *dc)
+{
+  enum GNUNET_FS_DownloadOptions opt;
+  struct GNUNET_FS_Handle *fs;
+  struct DownloadEntry *de;
+  uint64_t len;
+
+  GtkTreeIter iter;
+  GtkTreePath *path;
+
+  fs = GNUNET_FS_GTK_get_fs_handle ();
+  opt = GNUNET_FS_DOWNLOAD_OPTION_NONE;
+  if (dc->is_recursive)
+    opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
+  len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
+
+  de = GNUNET_malloc (sizeof (struct DownloadEntry));
+  de->uri = dc->uri;
+  dc->uri = NULL;
+  de->meta = dc->meta;
+  dc->meta = NULL;
+  if (dc->rr != NULL)
+  {
+    /* We're going to free "dc" very soon */
+    de->rr = gtk_tree_row_reference_copy (dc->rr);
+    de->ts = GTK_TREE_STORE (gtk_tree_row_reference_get_model (dc->rr));
+
+    path = gtk_tree_row_reference_get_path (de->rr);
+    GNUNET_assert (NULL != path);
+    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
+    {
+      /* Store filename and anonymity as specified by the user.
+       * These will be re-used when this is a directory, and the user
+       * downloads its children.
+       */
+      gtk_tree_store_set (de->ts, &iter, 15, dc->filename, 16, dc->anonymity, -1);
+    }
+    gtk_tree_path_free (path);
+
+  }
+  if (dc->sr != NULL)
+  {
+    GNUNET_break (NULL !=
+                  GNUNET_FS_download_start_from_search (fs, dc->sr,
+                                                        dc->filename,
+                                                        NULL /* tempname */ ,
+                                                        0 /* offset */ ,
+                                                        len, dc->anonymity, opt,
+                                                        de));
+  }
+  else
+  {
+    GNUNET_break (NULL !=
+                  GNUNET_FS_download_start (fs, de->uri, NULL /* meta */ ,
+                                            dc->filename, NULL /* tempname */ ,
+                                            0 /* offset */ ,
+                                            len, dc->anonymity, opt, de,
+                                            NULL /* parent download ctx */ ));
+  }
+  GNUNET_GTK_save_as_dialog_free_download_context (dc);
+}
 
 /**
  * Tell FS to start a download.  Begins by opening the
@@ -825,11 +989,16 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   struct SearchResult *sr;
   gchar *mime;
   struct DownloadContext *dc;
-  char *buf;
+  char *buf = NULL;
   char *tmp;
   size_t tmplen;
   char cwd[FILENAME_MAX];
+  char *download_directory;
   char *filename;
+  int local_parents;
+  int have_a_suggestion;
+  int anonymity;
+  int filename_is_absolute;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
       "Starting a %sdownload\n", sdc->recursive ? "recursive " : "");
@@ -858,24 +1027,32 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
     return;
   }
 
-
-  /* FIXME: we should check if this download is a file in some directory
-     (gtk_tree_model_iter_get_parent) and if so obtain the name under which
-     the directory was stored! */
-  /* Calculate suggested filename; first, pre-pend current working directory */
-  filename = GNUNET_FS_meta_data_suggest_filename (meta);
-  if (NULL != getcwd (cwd, sizeof (cwd)))
+  download_directory = get_default_download_directory (cwd, sizeof (cwd));
+  /* If no download directory is known, try working directory */
+  if (download_directory == NULL)
+    download_directory = getcwd (cwd, sizeof (cwd));
+  /* Calculate suggested filename */
+  local_parents = GNUNET_YES;
+  anonymity = -1;
+  filename_is_absolute = GNUNET_NO;
+  filename = get_suggested_filename_anonymity (tm, &iter, GNUNET_YES, &local_parents, &anonymity, &filename_is_absolute);
+  have_a_suggestion = GNUNET_NO;
+  if (NULL != download_directory)
   {
     if (NULL == filename)
     {
-      buf = GNUNET_strdup (cwd);
+      buf = GNUNET_strdup (download_directory);
     }
     else
     {
-      GNUNET_asprintf (&tmp, "%s%s%s",
-                       cwd,
-                       DIR_SEPARATOR_STR,
-                       filename);
+      have_a_suggestion = GNUNET_YES;
+      if (filename_is_absolute)
+        GNUNET_asprintf (&tmp, "%s", filename);
+      else
+        GNUNET_asprintf (&tmp, "%s%s%s",
+                         download_directory,
+                         DIR_SEPARATOR_STR,
+                         filename);
       tmplen = strlen (tmp);
       /* now, if we have a directory, replace trailing '/' with ".gnd" */
       if (GNUNET_YES ==
@@ -906,10 +1083,15 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   dc->rr = gtk_tree_row_reference_new (tm, path);
   dc->sr = sr->result;
-  dc->anonymity = -1;
+  dc->anonymity = anonymity;
   dc->is_recursive = sdc->recursive;
   dc->tab = tab;
-  GNUNET_FS_GTK_open_download_as_dialog (dc);
+  dc->cb = &open_download_as_callback;
+  if (local_parents && have_a_suggestion)
+    /* Skip the dialog, call directly */
+    open_download_as_callback (dc);
+  else
+    GNUNET_FS_GTK_open_download_as_dialog (dc);
 }
 
 
@@ -1608,6 +1790,8 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
                                      0 /* avail-cert */ ,
                                      13, 0, /* avail-rank */
                                      14, (guint64) 0, /* completed */
+                                     15, NULL, /* downloaded_filename */
+                                     16, -1, /* downloaded_anonymity */
                                      -1);
   if (tab != NULL)
   {