1 files changed, 131 insertions, 89 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 83c008d0..b4bf68cb 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -39,9 +39,6 @@
 #endif
 #endif
 
-
-static GtkTreeStore * summary;
-
 /**
  * XML tree for the meta-data dialog of upload.
  * (there can only be one at a time;
@@ -49,44 +46,148 @@ static GtkTreeStore * summary;
  */
 static GladeXML * metaXML;
 
-static struct GE_Context * ectx;
-
-static struct GC_Configuration * cfg;
+/* ************ FSUI event handlers ************ */
 
-/**
- */
-void displayUploadUpdate(struct FSUI_UploadList * list,
-                         const char * filename,
-                         unsigned long long completed,
-                         unsigned long long total) {
+void fs_upload_update(UploadList * list,
+                      unsigned long long completed) {
+  GtkTreeIter iter;
+  GtkTreePath * path;
   int progress;
 
-  DEBUG_BEGIN();
-  if (total != 0)
-    progress = 100 * completed / total;
+  if (list->total != 0)
+    progress = 100 * completed / list->total;
   else
     progress = 100;
-
-  /* FIXME! */
-  DEBUG_END();
+  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
+  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                          &iter,
+                          path);
+  gtk_tree_path_free(path);
+  gtk_tree_store_set(upload_summary,
+                     &iter,
+                     UPLOAD_PROGRESS, progress,
+                     -1);
 }
 
-/**
- */
-void displayUploadComplete(struct FSUI_UploadList * list,
-                           const char * filename,
-                           const struct ECRS_URI * uri) {
+void fs_upload_complete(UploadList * list,
+                        struct ECRS_URI * uri) {
+  GtkTreeIter iter;
+  GtkTreePath * path;
   char * us;
 
-  DEBUG_BEGIN();
-  GE_ASSERT(ectx, uri != NULL);
+  list->has_terminated = YES;
+  list->uri = ECRS_dupUri(uri);
   us = ECRS_uriToString(uri);
-  GE_ASSERT(ectx, us != NULL);
-  /* FIXME */
+  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
+  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                          &iter,
+                          path);
+  gtk_tree_path_free(path);
+  gtk_tree_store_set(upload_summary,
+                     &iter,
+                     UPLOAD_URISTRING, us,
+                     -1);
   FREE(us);
-  DEBUG_END();
 }
 
+void fs_upload_error(UploadList * list) {
+  /* FIXME: indicate error in summary dialog! */
+  list->has_terminated = YES;
+}
+
+void fs_upload_stopped(UploadList * list) {
+  GtkTreeIter iter;
+  GtkTreePath * path;
+  UploadList * prev;
+
+  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
+  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                          &iter,
+                          path);
+  gtk_tree_path_free(path);
+  gtk_tree_row_reference_free(list->summaryViewRowReference); 
+  list->summaryViewRowReference = NULL;
+  gtk_tree_store_remove(upload_summary,
+                        &iter);
+  FREE(list->filename);
+  if (list->uri != NULL) {
+    ECRS_freeUri(list->uri);
+    list->uri = NULL;
+  }  
+  if (upload_head == list)
+    upload_head = list->next;
+  else {
+    prev = upload_head;
+    while ( (prev != NULL) &&
+            (prev->next != list) )
+      prev = prev->next;
+    if (prev != NULL)
+      prev->next = list->next;
+    else
+      GE_BREAK(ectx, 0);
+  }
+  FREE(list);
+}
+
+UploadList * 
+fs_upload_started(struct FSUI_UploadList * fsui,
+                  UploadList * parent,
+                  const char * filename,
+                  struct ECRS_URI * uri,
+                  unsigned long long total,
+                  unsigned long long completed) {
+  UploadList * ret;
+  GtkTreeIter iter;
+  GtkTreePath * path;
+  int progress;
+
+  ret = MALLOC(sizeof(UploadList));
+  memset(ret,
+         0,
+         sizeof(UploadList));
+  ret->filename = STRDUP(filename);
+  ret->fsui_list = fsui;
+  ret->total = total;
+  if (parent == NULL) {
+    gtk_tree_store_append(upload_summary,
+                          &iter,
+                          NULL);
+  } else {
+    GtkTreeIter par;
+
+    path = gtk_tree_row_reference_get_path(parent->summaryViewRowReference);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                            &par,
+                            path);
+    gtk_tree_path_free(path);
+    gtk_tree_store_append(upload_summary,
+                          &iter,
+                          &par);
+  }
+
+  if (total != 0)
+    progress = 100 * completed / total;
+  else
+    progress = 100;
+  gtk_tree_store_set(upload_summary,
+                     &iter,
+                     UPLOAD_FILENAME, filename,
+                     UPLOAD_PROGRESS, progress,
+                     UPLOAD_URISTRING, "", /* FIXME: set if URI != NULL! */
+                     UPLOAD_INTERNAL, ret, 
+                     -1);
+  path = gtk_tree_model_get_path(GTK_TREE_MODEL(upload_summary),
+                                 &iter);
+  ret->summaryViewRowReference
+    = gtk_tree_row_reference_new(GTK_TREE_MODEL(upload_summary),
+                                 path);
+  ret->next = upload_head;
+  upload_head = ret;
+  return ret;
+}
+
+/* *************** Glade UI event handling ************** */
+
 
 void on_selectAlternativePreviewButton_selection_changed_fs(GtkWidget * preview,
                                                             GtkWidget * fileChooser) {
@@ -239,8 +340,8 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
                                   "previewImage");
     uc.keywordURI = getKeywordURIFromList(metaXML,
                                           "metaDataDialogKeywordList");
-    uc.anon = getAnonymityLevel(getMainXML(),
-                                "uploadAnonymityLevelSpinButton");   
+    uc.anon = getSpinButtonValue(getMainXML(),
+                                 "uploadAnonymityLevelSpinButton");   
     deepIndex = glade_xml_get_widget(getMainXML(),
                                      "deepIndexCheckButton");
     uc.deepIndex = (TRUE == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex))) ? YES : NO;
@@ -342,63 +443,4 @@ void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
   }
 }
 
-
-void fs_upload_start(struct GE_Context * e,
-                     struct GC_Configuration * c) {
-  GtkWidget * uploadList;
-  GtkWidget * uploadEntry;
-  GtkCellRenderer * renderer;
-  GtkListStore * model;
-  int col;
-
-  ectx = e;
-  cfg = c;
-  uploadList = glade_xml_get_widget(getMainXML(),
-                                    "activeUploadsList");
-  summary =
-    gtk_tree_store_new(UPLOAD_NUM,
-                       G_TYPE_STRING, /* filename */
-                       G_TYPE_INT,    /* progress */
-                       G_TYPE_STRING);  /* URI (as string) - after completion */
-  gtk_tree_view_set_model(GTK_TREE_VIEW(uploadList),
-                          GTK_TREE_MODEL(summary));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList)),
-                              GTK_SELECTION_MULTIPLE);
-  renderer = gtk_cell_renderer_progress_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
-                                              -1,
-                                              _("Filename"),
-                                              renderer,
-                                              "text", UPLOAD_FILENAME,
-                                              "value", UPLOAD_PROGRESS,
-                                              NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList),
-                                                              col - 1),
-                                     TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(uploadList),
-                                                    -1,
-                                                    _("URI"),
-                                                    renderer,
-                                                    "text", UPLOAD_URISTRING,
-                                                    NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(uploadList),
-                                                              col - 1),
-                                     TRUE);
-  
-  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);
-}
-
-void fs_upload_stop() {
-  /* nothing to be done */
-}
-
 /* end of upload.c */