1 files changed, 126 insertions, 87 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index edd2e045..be00afa7 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -42,29 +42,25 @@ SearchList * search_head;
 
 DownloadList * download_head;
 
+UploadList * upload_head;
+
 GtkListStore * search_summary;
 
 GtkTreeStore * download_summary;
 
-typedef struct {
-  const FSUI_Event * event;
-  void * ret;
-} SEP_Closure;
+GtkTreeStore * upload_summary;
 
-static void saveEventProcessor(void * arg) {
-  SEP_Closure * cls = arg;
-  const FSUI_Event * event = cls->event;
-  
-  cls->ret = NULL;
-  DEBUG_BEGIN();
+static void * eventProcessor(void * unused,
+                             const FSUI_Event * event) {
+  void * ret = NULL;
   switch (event->type) {
     /* search events */
   case FSUI_search_started:
-    cls->ret = fs_search_started(event->data.SearchStarted.sc.pos,
-                                 event->data.SearchStarted.searchURI,
-                                 event->data.SearchStarted.anonymityLevel,
-                                 0,
-                                 NULL);
+    ret = fs_search_started(event->data.SearchStarted.sc.pos,
+                            event->data.SearchStarted.searchURI,
+                            event->data.SearchStarted.anonymityLevel,
+                            0,
+                            NULL);
     break;
   case FSUI_search_result:
     fs_search_result_received(event->data.SearchResult.sc.cctx,
@@ -85,11 +81,11 @@ static void saveEventProcessor(void * arg) {
     fs_search_aborted(event->data.SearchSuspended.sc.cctx);
     break;
   case FSUI_search_resumed:
-    cls->ret = fs_search_started(event->data.SearchResumed.sc.pos,
-                                 event->data.SearchResumed.searchURI,
-                                 event->data.SearchResumed.anonymityLevel,
-                                 event->data.SearchResumed.fisSize,
-                                 event->data.SearchResumed.fis);
+    ret = fs_search_started(event->data.SearchResumed.sc.pos,
+                            event->data.SearchResumed.searchURI,
+                            event->data.SearchResumed.anonymityLevel,
+                            event->data.SearchResumed.fisSize,
+                            event->data.SearchResumed.fis);
   case FSUI_search_stopped:
     fs_search_aborted(event->data.SearchError.sc.cctx);
     break;
@@ -117,56 +113,68 @@ static void saveEventProcessor(void * arg) {
   case FSUI_download_stopped:
     fs_download_stopped(event->data.DownloadCompleted.dc.cctx);
     break;
- case FSUI_download_started:
-    cls->ret = fs_download_started(event->data.DownloadStarted.dc.pos,
-                                   event->data.DownloadStarted.dc.pcctx,
-                                   event->data.DownloadStarted.dc.sctx,
-                                   event->data.DownloadStarted.total,
-                                   event->data.DownloadStarted.anonymityLevel,
-                                   &event->data.DownloadStarted.fi,
-                                   event->data.DownloadStarted.filename,
-                                   0,
-                                   get_time());
+  case FSUI_download_started:
+    ret = fs_download_started(event->data.DownloadStarted.dc.pos,
+                              event->data.DownloadStarted.dc.pcctx,
+                              event->data.DownloadStarted.dc.sctx,
+                              event->data.DownloadStarted.total,
+                              event->data.DownloadStarted.anonymityLevel,
+                              &event->data.DownloadStarted.fi,
+                              event->data.DownloadStarted.filename,
+                              0,
+                              get_time());
     break;
   case FSUI_download_resumed:
-    cls->ret = fs_download_started(event->data.DownloadResumed.dc.pos,
-                                   event->data.DownloadStarted.dc.pcctx,
-                                   event->data.DownloadStarted.dc.sctx,
-                                   event->data.DownloadResumed.total,
-                                   event->data.DownloadResumed.anonymityLevel,
-                                   &event->data.DownloadResumed.fi,
-                                   event->data.DownloadResumed.filename,
-                                   event->data.DownloadResumed.completed,
-                                   event->data.DownloadResumed.eta);
+    ret = fs_download_started(event->data.DownloadResumed.dc.pos,
+                              event->data.DownloadStarted.dc.pcctx,
+                              event->data.DownloadStarted.dc.sctx,
+                              event->data.DownloadResumed.total,
+                              event->data.DownloadResumed.anonymityLevel,
+                              &event->data.DownloadResumed.fi,
+                              event->data.DownloadResumed.filename,
+                              event->data.DownloadResumed.completed,
+                              event->data.DownloadResumed.eta);
     break;
 
-
-    /* upload */
+    /* upload events */
   case FSUI_upload_progress:
-    displayUploadUpdate(event->data.UploadProgress.uc.cctx,
-                        event->data.UploadProgress.filename,
-                        event->data.UploadProgress.completed,
-                        event->data.UploadProgress.total);
+    fs_upload_update(event->data.UploadProgress.uc.cctx,
+                     event->data.UploadProgress.completed);
     break;
   case FSUI_upload_completed:
-    displayUploadComplete(event->data.UploadCompleted.uc.cctx,
-                          event->data.UploadCompleted.filename,
-                          event->data.UploadCompleted.uri);
-    addLogEntry(_("Upload `%s' complete"), 
-                event->data.UploadCompleted.filename);
-    gnunetgtk_notify(NOTIFY_NORMAL,
-                     _("Upload `%s' complete"), 
-                     event->data.UploadCompleted.filename);
+    fs_upload_complete(event->data.UploadCompleted.uc.cctx,
+                       event->data.UploadCompleted.uri);
     break;
   case FSUI_upload_error:
-    GE_LOG(ectx,
-           GE_ERROR,
-           _("Error while uploading: %s\n"),
-           event->data.UploadError.message);
-    gnunetgtk_notify(NOTIFY_NORMAL,
-                     _("Error while uploading `%s'"), 
-                     event->data.UploadError.message);
+    fs_upload_error(event->data.UploadError.uc.cctx);
+    break;
+  case FSUI_upload_aborted:
+    fs_upload_error(event->data.UploadAborted.uc.cctx);
+    break;
+  case FSUI_upload_stopped:
+    fs_upload_stopped(event->data.UploadStopped.uc.cctx);
+    break;
+  case FSUI_upload_suspended:
+    fs_upload_stopped(event->data.UploadSuspended.uc.cctx);
+    break;
+  case FSUI_upload_started:
+    ret = fs_upload_started(event->data.UploadStarted.uc.pos,
+                            event->data.UploadStarted.uc.pcctx,
+                            event->data.UploadStarted.filename,
+                            NULL,
+                            event->data.UploadStarted.total,
+                            0);
     break;
+  case FSUI_upload_resumed:
+    ret = fs_upload_started(event->data.UploadResumed.uc.pos,
+                            event->data.UploadResumed.uc.pcctx,
+                            event->data.UploadResumed.filename,
+                            NULL, /* FIXME: maybe completed!? */
+                            event->data.UploadResumed.total,
+                            event->data.UploadResumed.completed);
+    break;
+
+    /* TODO: unindex events */
   default:
     GE_BREAK(ectx, 0);
     GE_LOG(ectx,
@@ -175,38 +183,26 @@ static void saveEventProcessor(void * arg) {
            event->type);
     break;
   }
-  DEBUG_END();
-}
-
-/**
- * FSUI event handler.
- */
-static void * eventProcessor(void * unused,
-                             const FSUI_Event * event) {
-  SEP_Closure cls;
-  
-  cls.event = event;
-  cls.ret = NULL;
-  gtkSaveCall(&saveEventProcessor,
-              &cls);
-  return cls.ret;
+  return ret;
 }
 
 
-
 /**
  * Setup the summary views (in particular the models
  * and the renderers).  
  */
 static void fs_summary_start() {
   GtkComboBoxEntry * searchCB;
+  GtkWidget * uploadEntry;
   GtkTreeView * searchList;
   GtkTreeView * downloadList;
+  GtkTreeView * uploadList;
   GtkListStore * model;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
   int col;
-  
+
+  /* search namespace selection setup */
   searchCB
     = GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
                                                "fssearchKeywordComboBoxEntry"));
@@ -221,6 +217,8 @@ static void fs_summary_start() {
                           GTK_TREE_MODEL(model));
   gtk_combo_box_entry_set_text_column(searchCB,
                                       NS_SEARCH_DESCRIPTION);
+
+  /* search summary setup */
   searchList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
                                                   "activeSearchesSummary"));
   search_summary =
@@ -262,7 +260,7 @@ static void fs_summary_start() {
   gtk_tree_view_column_set_sort_column_id(column, SEARCH_SUMMARY_RESULT_COUNT);
   gtk_tree_view_column_set_resizable(column, TRUE);
 
-
+  /* download summary setup */
   downloadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
                                                     "activeDownloadsList"));
   download_summary =
@@ -324,10 +322,56 @@ static void fs_summary_start() {
   gtk_tree_view_column_set_reorderable(column, TRUE);
   /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
   gtk_tree_view_column_set_resizable(column, TRUE);
+
+  /* upload summary setup */
+  uploadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
+                                                  "activeUploadsList"));
+  upload_summary =
+    gtk_tree_store_new(UPLOAD_NUM,
+                       G_TYPE_STRING, /* filename */
+                       G_TYPE_INT,    /* progress */
+                       G_TYPE_STRING,
+                       G_TYPE_POINTER);  /* URI (as string) - after completion */
+  gtk_tree_view_set_model(uploadList,
+                          GTK_TREE_MODEL(upload_summary));
+  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(uploadList),
+                              GTK_SELECTION_MULTIPLE);
+  renderer = gtk_cell_renderer_progress_new();
+  col = gtk_tree_view_insert_column_with_attributes(uploadList,
+                                                    -1,
+                                                    _("Filename"),
+                                                    renderer,
+                                                    "text", UPLOAD_FILENAME,
+                                                    "value", UPLOAD_PROGRESS,
+                                                    NULL);
+  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList,
+                                                              col - 1),
+                                     TRUE);
+  renderer = gtk_cell_renderer_text_new();
+  col = gtk_tree_view_insert_column_with_attributes(uploadList,
+                                                    -1,
+                                                    _("URI"),
+                                                    renderer,
+                                                    "text", UPLOAD_URISTRING,
+                                                    NULL);
+  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList,
+                                                              col - 1),
+                                     TRUE);
+
+  /* upload entry setup */
+  uploadEntry
+    = glade_xml_get_widget(getMainXML(),
+                           "uploadFilenameComboBoxEntry");
+
+  model = gtk_list_store_new(1, G_TYPE_STRING);
+  gtk_combo_box_set_model(GTK_COMBO_BOX(uploadEntry),
+                          GTK_TREE_MODEL(model));
+  gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(uploadEntry),
+                                      0);
 }
 
 /**
- * Shutdown.
+ * Shutdown the summary dialogs.
  */
 static void fs_summary_stop() {
   GtkComboBox * searchCB;
@@ -343,8 +387,6 @@ static void fs_summary_stop() {
 
 
 
-
-
 void init_fs(struct GE_Context * e,
              struct GC_Configuration * c) {
   GtkWidget * tab;
@@ -366,14 +408,13 @@ void init_fs(struct GE_Context * e,
   ctx = FSUI_start(ectx,
                    cfg,
                    "gnunet-gtk",
-                   128,
+                   128, /* FIXME: allow user to configure download parallelism */
                    YES,
                    &eventProcessor,
                    NULL);
-  fs_collection_start(ectx, cfg);
+  fs_collection_start();
   fs_summary_start();
-  fs_upload_start(ectx, cfg);
-  fs_namespace_start(ectx, cfg);
+  fs_namespace_start();
 }
 
 void done_fs() {
@@ -384,9 +425,7 @@ void done_fs() {
                            "fsnotebook");
   gtk_widget_hide(tab);
   fs_summary_stop();
-  fs_collection_stop();
   fs_namespace_stop();
-  fs_upload_stop();
   FSUI_stop(ctx);
 }