fixing mantis 1012

7 files changed, 235 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 59eddbd6..9849b9e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat Feb  3 22:03:52 MST 2007
+        Added ability to open gnunet-directory.
+
 Sat Feb  3 21:00:23 MST 2007
         Added ability to save search results as gnunet-directory
         (in right-click context menu).
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index db0473bb..863120f2 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -1883,6 +1883,35 @@ This release fixes downloads of files from directories.  The previous version ha
                           <property name="fill">True</property>
                         </packing>
                       </child>
+
+                      <child>
+                        <widget class="GtkVSeparator" id="vseparator3">
+                          <property name="visible">True</property>
+                        </widget>
+                        <packing>
+                          <property name="padding">9</property>
+                          <property name="expand">False</property>
+                          <property name="fill">False</property>
+                        </packing>
+                      </child>
+
+                      <child>
+                        <widget class="GtkButton" id="openDirectoryButton">
+                          <property name="visible">True</property>
+                          <property name="tooltip" translatable="yes">Open GNUnet directory</property>
+                          <property name="can_focus">True</property>
+                          <property name="label">gtk-open</property>
+                          <property name="use_stock">True</property>
+                          <property name="relief">GTK_RELIEF_NORMAL</property>
+                          <property name="focus_on_click">True</property>
+                          <signal name="clicked" handler="on_open_menu_activate_" last_modification_time="Sun, 04 Feb 2007 04:42:58 GMT"/>
+                        </widget>
+                        <packing>
+                          <property name="padding">0</property>
+                          <property name="expand">False</property>
+                          <property name="fill">False</property>
+                        </packing>
+                      </child>
                     </widget>
                     <packing>
                       <property name="padding">0</property>
@@ -7934,21 +7963,23 @@ Daniel Nylander &lt;po@danielnylander.se&gt;
   </child>
 </widget>
 
-<widget class="GtkFileChooserDialog" id="filechooserdialog1">
+<widget class="GtkFileChooserDialog" id="openDirectoryFileDialog">
   <property name="visible">True</property>
   <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
   <property name="local_only">True</property>
   <property name="select_multiple">False</property>
   <property name="show_hidden">False</property>
   <property name="do_overwrite_confirmation">False</property>
+  <property name="title" translatable="yes">Select GNUnet directory file to open</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="icon_name">gtk-open</property>
   <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
+  <property name="skip_taskbar_hint">True</property>
+  <property name="skip_pager_hint">True</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
index 2d07659f..17bd42ac 100644
--- a/src/plugins/fs/Makefile.am
+++ b/src/plugins/fs/Makefile.am
@@ -11,6 +11,7 @@ plugin_LTLIBRARIES = \
 
 libgnunetgtkmodule_fs_la_SOURCES = \
   collection.c collection.h \
+  directory.c \
   fs.c fs.h \
   helper.c helper.h \
   meta.c meta.h \
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
new file mode 100644
index 00000000..1bf2db5d
--- /dev/null
+++ b/src/plugins/fs/directory.c
@@ -0,0 +1,162 @@
+/*
+     This file is part of GNUnet.
+     (C) 2007 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/plugins/fs/directory.c
+ * @brief code for opening directories
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunetgtk_common.h"
+#include "fs.h"
+#include "helper.h"
+#include "meta.h"
+#include "search.h"
+#include <GNUnet/gnunet_util_crypto.h>
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include <GNUnet/gnunet_namespace_lib.h>
+#include <extractor.h>
+
+#ifndef MINGW
+static char *
+selectFile() {
+  GladeXML * uploadXML;
+  GtkFileChooser * dialog;
+  char * ret;
+
+  uploadXML
+    = glade_xml_new(getGladeFileName(),
+                    "openDirectoryFileDialog",
+                    PACKAGE_NAME);
+  connectGladeWithPlugins(uploadXML);
+  dialog = GTK_FILE_CHOOSER(glade_xml_get_widget(uploadXML,
+                                                 "openDirectoryFileDialog"));
+  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
+    ret = gtk_file_chooser_get_filename(dialog);
+  else
+    ret = NULL;
+  gtk_widget_destroy(GTK_WIDGET(dialog));
+  UNREF(uploadXML);
+  return ret;
+}
+#else /* MINGW */
+static char *
+selectFile() {
+  return plibc_ChooseFile(_("Choose the directory you want to open."),
+                          OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
+}
+#endif /* MINGW */
+
+static int
+spcb(const ECRS_FileInfo * fi,
+     const HashCode512 * key,
+     int isRoot,
+     void * closure) {
+  SearchList * list = closure;
+  fs_search_result_received(list,
+                            fi,
+                            list->uri);
+  return OK;
+}
+
+
+void on_open_menu_activate_fs(GtkWidget * dummy1,
+                              GtkWidget * dummy2) {
+  char * dn;
+  char * directory_data;
+  unsigned long long directory_data_len;
+  size_t dlen;
+  struct ECRS_MetaData * md;
+  int fd;
+  SearchList * list;
+  struct ECRS_URI * uri;
+  const char * kws[2];
+#if 1
+  /* somehow on my system I get this (and only this event)
+     always twice -- not sure why, but this is a workaround
+     for now */
+  static int modulo;
+
+  if (0 == (1 & modulo++))
+    return; 
+#endif
+  dn = selectFile();
+  if (dn == NULL)
+    return;
+  if ( (YES != disk_file_test(NULL,
+                              dn)) ||
+       (OK != disk_file_size(NULL,
+                             dn,
+                             &directory_data_len,
+                             YES)) ) {
+    addLogEntry(_("Error accessing file `%s'."),
+                dn);
+    FREE(dn);
+    return;
+  }
+  fd = disk_file_open(NULL,
+                      dn,
+                      O_LARGEFILE | O_RDONLY);
+  if (fd == -1) {
+    addLogEntry(_("Error opening file `%s'."),
+                dn);
+    FREE(dn);
+    return;
+  }
+  dlen = (size_t) directory_data_len;
+  directory_data = MMAP(NULL,
+                        dlen,
+                        PROT_READ,
+                        MAP_SHARED,
+                        fd,
+                        0);
+  if (directory_data == MAP_FAILED) {
+    addLogEntry(_("Error mapping file `%s' into memory."),
+                dn);
+    CLOSE(fd);
+    FREE(dn);
+    return;
+  }
+  kws[0] = dn;
+  kws[1] = NULL;
+  uri = ECRS_keywordsToUri(kws);
+  md = NULL;
+  list = fs_search_started(NULL,
+                           uri,
+                           0,
+                           0,
+                           NULL,
+                           FSUI_COMPLETED);
+  ECRS_freeUri(uri);
+  ECRS_listDirectory(NULL,
+                     directory_data,
+                     directory_data_len,
+                     &md,
+                     &spcb,
+                     list);
+  if (md != NULL)
+    ECRS_freeMetaData(md);
+  MUNMAP(directory_data, dlen);
+  CLOSE(fd);
+  FREE(dn);
+}
+
+/* end of directory.c */
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 0b257c68..c81cbaa6 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -1439,11 +1439,6 @@ void fs_namespace_start() {
   DEBUG_END();
 }
 
-void on_open_menu_activate_fs(GtkWidget * dummy1,
-                              GtkWidget * dummy2) {
-  printf("Not implemented\n");
-}
-
 #if 0
 void on_availableContentList_destroy_fs(GtkWidget * dummy1,
                                         GtkWidget * dummy2) {
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index a851b6cb..5c2b0df7 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2007 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -908,13 +908,19 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  fcbc.method = &FSUI_abortSearch;
-  fcbc.argument = list->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
-  fcbc.method = &FSUI_stopSearch;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  if (list->fsui_list == NULL) {
+    /* open directory - close directly */
+    fs_search_stopped(list);
+  } else {
+    /* actual search - close via FSUI */
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = list->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+    fcbc.method = &FSUI_stopSearch;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 /**
@@ -932,11 +938,12 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-
-  fcbc.method = &FSUI_abortSearch;
-  fcbc.argument = list->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  if (list->fsui_list != NULL) {
+    fcbc.method = &FSUI_abortSearch;
+    fcbc.argument = list->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 static void stopSearch(GtkTreeModel * model,
@@ -952,13 +959,18 @@ static void stopSearch(GtkTreeModel * model,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL) {
-    fcbc.method = &FSUI_abortSearch;
-    fcbc.argument = s->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-    fcbc.method = &FSUI_stopSearch;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
+    if (s->fsui_list == NULL) {
+      /* open directory - close directly */
+      fs_search_stopped(s);
+    } else {
+      fcbc.method = &FSUI_abortSearch;
+      fcbc.argument = s->fsui_list;
+      run_with_save_calls(&fsui_callback,
+                          &fcbc);
+      fcbc.method = &FSUI_stopSearch;
+      run_with_save_calls(&fsui_callback,
+                          &fcbc);
+    }
   }
 }
 
@@ -988,7 +1000,8 @@ static void abortSearch(GtkTreeModel * model,
                      iter,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
-  if (s != NULL) {
+  if ( (s != NULL) &&
+       (s->fsui_list != NULL) ) {
     fcbc.method = &FSUI_abortSearch;
     fcbc.argument = s->fsui_list;
     run_with_save_calls(&fsui_callback,
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index e8d91b2e..971c1bb9 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -452,7 +452,6 @@ void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
 }
 
 #ifndef MINGW
-
 static char *
 selectFile(const char * oldfilename) {
   GladeXML * uploadXML;