1 files changed, 176 insertions, 57 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index f5eef201..c0c9fbbc 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -105,9 +105,35 @@ struct SearchResult
 };
 
 
+struct StartDownloadContext
+{
+  struct SearchTab *tab;
+  gboolean recursive;
+};
 
 static struct PublishTab *publish_tab;
 
+struct UpdateSearchItem
+{
+  struct UpdateSearchItem *prev;
+  struct UpdateSearchItem *next;
+  struct DownloadEntry *de;
+  uint64_t size;
+  uint64_t completed;
+  void *block_data;
+  uint64_t offset;
+  uint64_t block_size;
+  unsigned int depth;
+};
+
+GNUNET_SCHEDULER_TaskIdentifier update_progress_task = GNUNET_SCHEDULER_NO_TASK;
+
+
+static void
+closure_notify_free (gpointer data, GClosure *closure)
+{
+  GNUNET_free (data);
+}
 
 static struct DownloadEntry *
 change_download_colour (struct DownloadEntry *de, const char *colour)
@@ -167,23 +193,26 @@ stop_download (struct DownloadEntry *de, int is_suspend)
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping download DE=%p, %s\n", de, is_suspend ? "temporarily" : "permanently");
   path = gtk_tree_row_reference_get_path (de->rr);
   tm = gtk_tree_row_reference_get_model (de->rr);
-  if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
-    GNUNET_break (0);
-  else
+  if (path != NULL)
   {
-    gtk_tree_model_get (tm, &iter, 9, &search_result, -1);
-    /*Always fails on downloads started by Download URI */
-    /*GNUNET_assert (search_result->download == de); */
-    search_result->download = NULL;
-    if (NULL == search_result->result)
+    if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
+      GNUNET_break (0);
+    else
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing it from the tree\n");
-      (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+      gtk_tree_model_get (tm, &iter, 9, &search_result, -1);
+      /*Always fails on downloads started by Download URI */
+      /*GNUNET_assert (search_result->download == de); */
+      search_result->download = NULL;
+      if (NULL == search_result->result)
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Removing it from the tree\n");
+        (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+      }
+      else
+         change_download_colour (de, "white");
     }
-    else
-      change_download_colour (de, "white");
+    gtk_tree_path_free (path);
   }
-  gtk_tree_path_free (path);
   gtk_tree_row_reference_free (de->rr);
   GNUNET_FS_uri_destroy (de->uri);
   GNUNET_CONTAINER_meta_data_destroy (de->meta);
@@ -282,48 +311,120 @@ add_directory_entry (void *cls, const char *filename,
 }
 
 
+static void
+mark_download_progress_delayed (struct DownloadEntry *de, uint64_t size,
+    uint64_t completed, const void *block_data,
+    uint64_t offset, uint64_t block_size, unsigned int depth)
+{
+  GtkTreeIter iter;
+  GtkTreePath *path;
+
+  do
+  {
+    path = gtk_tree_row_reference_get_path (de->rr);
+    if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
+    {
+      GNUNET_break (0);
+      gtk_tree_path_free (path);
+      break;
+    }
+    gtk_tree_path_free (path);
+    gtk_tree_store_set (de->ts, &iter, 4,
+                        (guint) ((size >
+                                  0) ? (100 * completed /
+                                        size) : 100) /* progress */ ,
+                        14, completed, -1);
+    if ((depth == 0) && (block_size > 0) &&
+        (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)))
+    {
+      struct AddDirectoryEntryContext ade;
+      ade.de = de;
+      ade.prr = de->rr;
+      ade.check_duplicates = GNUNET_NO;
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "It is a directory, list its contents\n");
+      if (GNUNET_SYSERR ==
+          GNUNET_FS_directory_list_contents ((size_t) block_size, block_data,
+                                             offset, &add_directory_entry, &ade))
+      {
+        GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                    _
+                    ("Metadata wrongly claims that this is a GNUnet directory!\n"));
+      }
+    }
+  } while (0);
+}
+
+
+void
+GNUNET_FS_GTK_update_download_progress (void *cls,
+    const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  struct SearchTab *st;
+  GtkTreeStore *ts;
+  struct UpdateSearchItem *usi_head;
+  struct UpdateSearchItem *usi_tail;
+  struct UpdateSearchItem *usi;
+  struct UpdateSearchItem *next;
+
+  update_progress_task = GNUNET_SCHEDULER_NO_TASK;
+  for (st = search_tab_head; st; st = st->next)
+  {
+    ts = st->ts;
+    usi_head = g_object_get_data (G_OBJECT (ts), "usi_head");
+    usi_tail = g_object_get_data (G_OBJECT (ts), "usi_tail");
+    for (usi = usi_head; NULL != usi; usi = next)
+    {
+      next = usi->next;
+      mark_download_progress_delayed (usi->de, usi->size,
+          usi->completed, usi->block_data, usi->offset, usi->block_size,
+          usi->depth);
+      GNUNET_CONTAINER_DLL_remove (usi_head, usi_tail, usi);
+      GNUNET_free_non_null (usi->block_data);
+      GNUNET_free (usi);
+    }
+    g_object_set_data (G_OBJECT (ts), "usi_head", usi_head);
+    g_object_set_data (G_OBJECT (ts), "usi_tail", usi_tail);
+  }
+  if (!(tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+    update_progress_task = GNUNET_SCHEDULER_add_delayed (
+        GNUNET_TIME_UNIT_SECONDS,
+        GNUNET_FS_GTK_update_download_progress, NULL);
+}
+
+
 static struct DownloadEntry *
 mark_download_progress (struct DownloadEntry *de, uint64_t size,
                         uint64_t completed, const void *block_data,
                         uint64_t offset, uint64_t block_size,
                         unsigned int depth)
 {
-  struct AddDirectoryEntryContext ade;
-  GtkTreeIter iter;
-  GtkTreePath *path;
+  struct UpdateSearchItem *usi_head;
+  struct UpdateSearchItem *usi_tail;
+  struct UpdateSearchItem *usi_new;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
       "Marking download progress for DE=%p, %llu/%llu, %llu@%llu depth=%u\n",
       de, completed, size, block_size, offset, depth);
-  path = gtk_tree_row_reference_get_path (de->rr);
-  if (TRUE != gtk_tree_model_get_iter (GTK_TREE_MODEL (de->ts), &iter, path))
-  {
-    GNUNET_break (0);
-    gtk_tree_path_free (path);
-    return de;
-  }
-  gtk_tree_path_free (path);
-  gtk_tree_store_set (de->ts, &iter, 4,
-                      (guint) ((size >
-                                0) ? (100 * completed /
-                                      size) : 100) /* progress */ ,
-                      -1);
-  if ((depth == 0) && (block_size > 0) &&
-      (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)))
-  {
-    ade.de = de;
-    ade.prr = de->rr;
-    ade.check_duplicates = GNUNET_NO;
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "It is a directory, list its contents\n");
-    if (GNUNET_SYSERR ==
-        GNUNET_FS_directory_list_contents ((size_t) block_size, block_data,
-                                           offset, &add_directory_entry, &ade))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  _
-                  ("Metadata wrongly claims that this is a GNUnet directory!\n"));
-    }
-  }
+
+  usi_head = g_object_get_data (G_OBJECT (de->ts), "usi_head");
+  usi_tail = g_object_get_data (G_OBJECT (de->ts), "usi_tail");
+  usi_new = GNUNET_malloc (sizeof (struct UpdateSearchItem));
+  usi_new->de = de;
+  usi_new->size = size;
+  usi_new->completed = completed;
+  usi_new->block_data = GNUNET_malloc (block_size);
+  memcpy (usi_new->block_data, block_data, block_size);
+  usi_new->offset = offset;
+  usi_new->block_size = block_size;
+  usi_new->depth = depth;
+  GNUNET_CONTAINER_DLL_insert_tail (usi_head, usi_tail, usi_new);
+  g_object_set_data (G_OBJECT (de->ts), "usi_head", usi_head);
+  g_object_set_data (G_OBJECT (de->ts), "usi_tail", usi_tail);
+
+  if (update_progress_task == GNUNET_SCHEDULER_NO_TASK)
+    update_progress_task = GNUNET_SCHEDULER_add_delayed (
+        GNUNET_TIME_UNIT_SECONDS,
+        GNUNET_FS_GTK_update_download_progress, NULL);
   return de;
 }
 
@@ -425,7 +526,7 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
   GtkTreePath *path;
   struct GNUNET_CONTAINER_MetaData *meta;
   struct GNUNET_FS_Uri *uri;
-  guint64 filesize;
+  guint64 filesize, completed;
   GdkPixbuf *preview;
   guint percent_progress;
   guint percent_availability;
@@ -447,7 +548,8 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
                           &percent_availability, 6, &filename, 7,
                           &uri_as_string, 8, &status_colour, 9, &search_result,
                           10, &mimetype, 11, &applicability_rank, 12,
-                          &availability_certainty, 13, &availability_rank, -1);
+                          &availability_certainty, 13, &availability_rank, 14,
+                          &completed, -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,
@@ -457,7 +559,7 @@ move_children (GtkTreeModel * src_model, GtkTreeIter * src_iter,
                                          search_result, 10, mimetype, 11,
                                          applicability_rank, 12,
                                          availability_certainty, 13,
-                                         availability_rank, -1);
+                                         availability_rank, 14, completed, -1);
       g_free (filename);
       g_free (uri_as_string);
       g_free (status_colour);
@@ -644,6 +746,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                       6, filename /* filename/description */ ,
                       8, "blue" /* status colour: pending */ ,
                       -1);
+  gtk_tree_store_set (de->ts, &iter, 14, completed, -1);
   return de;
 }
 
@@ -654,9 +757,10 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
  */
 static void
 start_download (GtkTreeView * tree_view, GtkTreePath * path,
-                GtkTreeViewColumn * column, gboolean recursive, gpointer user_data)
+                GtkTreeViewColumn * column, gpointer user_data)
 {
-  struct SearchTab *tab = user_data;
+  struct StartDownloadContext *sdc = user_data;
+  struct SearchTab *tab = sdc->tab;
   GtkTreeModel *tm;
   GtkTreeIter iter;
   struct GNUNET_FS_Uri *uri;
@@ -671,13 +775,14 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   char *filename;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-      "Starting a %sdownload\n", recursive ? "recursive " : "");
+      "Starting a %sdownload\n", sdc->recursive ? "recursive " : "");
 
   GNUNET_assert (tab != NULL);
   tm = gtk_tree_view_get_model (tree_view);
   if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
   {
     GNUNET_break (0);
+    GNUNET_free (sdc);
     return;
   }
   gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1);
@@ -685,6 +790,7 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   {
     /* can only download chk/loc URIs, ignore */
     g_free (mime);
+    GNUNET_free (sdc);
     return;
   }
 
@@ -737,7 +843,8 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
   dlc->anonymity = -1;
-  dlc->is_recursive = recursive;
+  dlc->is_recursive = sdc->recursive;
+  dlc->tab = tab;
   GNUNET_FS_GTK_open_download_as_dialog (dlc);
   g_free (mime);
 }
@@ -762,6 +869,7 @@ start_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
   GtkTreePath *path;
   GtkTreeView *tv;
+  struct StartDownloadContext sdc;
 
   if (current_context_row_reference == NULL)
   {
@@ -774,7 +882,9 @@ start_download_ctx_menu (GtkMenuItem *item, gpointer user_data)
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (current_context_search_tab->builder,
                        "_search_result_frame"));
-  start_download (tv, path, NULL, FALSE, current_context_search_tab);
+  sdc.tab = current_context_search_tab;
+  sdc.recursive = FALSE;
+  start_download (tv, path, NULL, &sdc);
   gtk_tree_path_free (path);
   current_context_search_tab = NULL;
 }
@@ -787,6 +897,7 @@ start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
 {
   GtkTreePath *path;
   GtkTreeView *tv;
+  struct StartDownloadContext sdc;
 
   if (current_context_row_reference == NULL)
   {
@@ -799,7 +910,9 @@ start_download_recursively_ctx_menu (GtkMenuItem *item, gpointer user_data)
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (current_context_search_tab->builder,
                        "_search_result_frame"));
-  start_download (tv, path, NULL, TRUE, current_context_search_tab);
+  sdc.tab = current_context_search_tab;
+  sdc.recursive = TRUE;
+  start_download (tv, path, NULL, &sdc);
   gtk_tree_path_free (path);
   current_context_search_tab = NULL;
 }
@@ -1240,6 +1353,7 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
   GtkNotebook *notebook;
   GtkWindow *sf;
   gint pages;
+  struct StartDownloadContext *sdc;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
       "Setting up a search for %p\n", sc);
@@ -1314,8 +1428,12 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
   /* add signal handlers */
   tv = GTK_TREE_VIEW (gtk_builder_get_object
                       (tab->builder, "_search_result_frame"));
-  g_signal_connect (G_OBJECT (tv), "row-activated", G_CALLBACK (start_download),
-                    tab);
+  sdc = GNUNET_malloc (sizeof (struct StartDownloadContext));
+  sdc->tab = tab;
+  sdc->recursive = FALSE;
+  g_signal_connect_data (G_OBJECT (tv), "row-activated", 
+                         G_CALLBACK (start_download), sdc, 
+                         &closure_notify_free, 0);
   g_signal_connect (G_OBJECT (tv), "cursor-changed",
                     G_CALLBACK (update_meta_data_views), tab);
   g_signal_connect (G_OBJECT (tv), "button_press_event",
@@ -1499,7 +1617,8 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
                                      7, uris, 8, status_colour, 9, sr, 10, mime,
                                      11, applicability_rank, 12,
                                      0 /* avail-cert */ ,
-                                     13, 0 /* avail-rank */ ,
+                                     13, 0, /* avail-rank */
+                                     14, (guint64) 0, /* completed */
                                      -1);
   if (tab != NULL)
   {