bugfixes

2 files changed, 54 insertions, 11 deletions

diff --git a/TODO b/TODO
index fe9d0580..3185d18e 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,7 @@
 - support new FSUI apis: [pre0]
   * insert 21.pdf, search 21, search application/pdf, stop insert, abort search (summary), stop search (search), exit => crash
   * (inserted 21.pdf), search application/pdf, download => no progress!
+     => related to existing bug in GNUnet with recursive download???
   * test, test, test!
 - disable inactive buttons (if no search/download 
   is selected to operate on) [ medium ] [pre1]
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index ff3f361c..19b2f73a 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -383,6 +383,41 @@ void fs_download_stopped(DownloadList * list) {
 /* **************** user download events ******************** */
 
 /**
+ * Check if a download for the given filename is
+ * already running.
+ *
+ * @return OK if no download is pending, SYSERR if
+ *  such a download is already active.
+ */ 
+static int
+check_pending(const char * filename,
+              GtkTreeIter * parent) {
+  GtkTreeModel * model;
+  GtkTreeIter iter;
+  const char * name;
+
+  model = GTK_TREE_MODEL(download_summary);
+  if (gtk_tree_model_iter_children(model,
+                                   &iter,
+                                   parent)) {
+    do {        
+      gtk_tree_model_get(model,
+                         &iter,
+                         DOWNLOAD_FILENAME, &name,
+                         -1);
+      if ( (name != NULL) &&
+           (0 == strcmp(name, filename)) )
+        return SYSERR;
+      if (SYSERR == check_pending(filename,
+                                  &iter))
+        return SYSERR;
+    } while (gtk_tree_model_iter_next(model,
+                                      &iter));
+  }
+  return OK;
+}
+
+/**
  * The user clicked the download button.
  * Start the download of the selected entry.
  */
@@ -544,17 +579,24 @@ initiateDownload(GtkTreeModel * model,
                                                       - strlen(GNUNET_DIRECTORY_EXT)],
                       GNUNET_DIRECTORY_EXT)) ) )
     strcat(idc_final_download_destination, GNUNET_DIRECTORY_EXT);
-   
-  addLogEntry(_("Downloading `%s'"), idc_name);
-  FSUI_startDownload(ctx,
-                     getSpinButtonValue(searchContext->searchXML,
-                                        "downloadAnonymitySpinButton"),
-                     NO, /* FIXME: isRecursive */
-                     idc_uri,
-                     idc_meta,
-                     idc_final_download_destination,
-                     searchContext->fsui_list,
-                     (parentContext != NULL) ? parentContext->fsui_list : NULL);
+
+  /* FIXME: check that there is no pending download
+     for idc_name! */
+  if (OK == check_pending(idc_name,
+                          NULL)) {
+    addLogEntry(_("Downloading `%s'"), idc_name);
+    FSUI_startDownload(ctx,
+                       getSpinButtonValue(searchContext->searchXML,
+                                          "downloadAnonymitySpinButton"),
+                       NO, /* FIXME: isRecursive */
+                       idc_uri,
+                       idc_meta,
+                       idc_final_download_destination,
+                       searchContext->fsui_list,
+                       (parentContext != NULL) ? parentContext->fsui_list : NULL);
+  } else {
+    addLogEntry(_("ERROR: already downloading `%s'"), idc_name);
+  }
   FREE(uri_name);
   FREE(dirPath);
   FREENONNULL(final_download_dir);