making gnunet-gtk compile

1 files changed, 77 insertions, 67 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index cc287093..2e645738 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -44,6 +44,10 @@ static DownloadList * head;
 
 static GtkTreeStore * summary;
 
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
+
 static int addFilesToDirectory
   (const ECRS_FileInfo * fi,
    const HashCode512 * key,
@@ -59,7 +63,6 @@ static int addFilesToDirectory
   if (isRoot == YES)
     return OK;
   DEBUG_BEGIN();
-  FSUI_trackURI(fi);
   pos = head;
   while (pos != NULL) {
     if (ECRS_equalsUri(uri,
@@ -112,7 +115,7 @@ typedef struct {
   const char * mime;
   char * final_download_destination;
   unsigned int anon;
-  int ret;
+  struct FSUI_SearchList * ret;
 } InitiateDownloadCls;
 
 static void * startSearch(void * cls) {
@@ -120,6 +123,8 @@ static void * startSearch(void * cls) {
 
   idc->ret = FSUI_startSearch(ctx,
                               idc->anon,
+                              1000, /* FIXME: max results */
+                              99 * cronYEARS, /* fixme: timeout */
                               idc->uri);
   return NULL;
 }
@@ -129,6 +134,7 @@ static void * startDownload(void * cls) {
 
   FSUI_startDownload(ctx,
                      idc->anon,
+                     NO, /* FIXME: isRecursive */
                      idc->uri,
                      idc->final_download_destination);
   return NULL;
@@ -189,8 +195,8 @@ static void initiateDownload(GtkTreeModel * model,
          we'll just add it as a new tab for now */
       run_with_save_calls(&startSearch,
                           &idc);
-      if (idc.ret == OK) 
-        openTabForSearch(NULL,
+      if (idc.ret != NULL) 
+        openTabForSearch(idc.ret,
                          idc.uri,
                          idc.anon,
                          0,
@@ -238,11 +244,11 @@ static void initiateDownload(GtkTreeModel * model,
   if (*cname == '\0') /* name ended in '/' - likely directory */
     cname = oname;
   idc.name = cname;
-
-  final_download_dir = getFileName("FS",
-                                   "INCOMINGDIR",
-                                   _("You must specify a directory in the configuration"
-                                     " in section `%s' under `%s'."));
+  GC_get_configuration_value_filename(cfg,
+                                      "FS",
+                                      "INCOMINGDIR",
+                                      "$HOME/gnunet-downloads/",
+                                      &final_download_dir);
   if (strlen(dname) > 0) {
     char * tmp;
     tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
@@ -301,7 +307,8 @@ static void initiateDownload(GtkTreeModel * model,
     strcat(idc.final_download_destination,
            DIR_SEPARATOR_STR);
   strcat(idc.final_download_destination, dirPath);
-  mkdirp(idc.final_download_destination);
+  disk_directory_create(ectx,
+                        idc.final_download_destination);
   strcat(idc.final_download_destination, idc.name);
   if ( (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '/') ||
        (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '\\') )
@@ -331,11 +338,11 @@ static void initiateDownload(GtkTreeModel * model,
   if (final_download_dir[strlen(final_download_dir)-1] != DIR_SEPARATOR)
     strcat(list->finalName, DIR_SEPARATOR_STR);
   strcat(list->finalName, dirPath);
-  mkdirp(list->finalName);
+  disk_directory_create(ectx, list->finalName);
   strcat(list->finalName, idc.name);
   head = list;
   size = ECRS_fileSize(idc.uri);
-  size_h = getHumanSize(size);
+  size_h = string_get_fancy_byte_size(size);
   gtk_tree_store_insert(summary,
                         &iiter,
                         NULL,
@@ -395,7 +402,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
   urid = STRDUP(uris);
   gtk_entry_set_text(GTK_ENTRY(entry),
                      ECRS_URI_PREFIX);
-  idc.uri = ECRS_stringToUri(urid);
+  idc.uri = ECRS_stringToUri(ectx, urid);
   if (idc.uri == NULL) {
     addLogEntry(_("Invalid URI `%s'"), urid);
     FREE(urid);
@@ -412,11 +419,12 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
     ECRS_freeUri(idc.uri);
     return;
   }
-  final_download_dir = getFileName("FS",
-                                   "INCOMINGDIR",
-                                   _("You must specify a directory in the configuration"
-                                     " in section `%s' under `%s'."));
-  mkdirp(final_download_dir);
+  GC_get_configuration_value_filename(cfg,
+                                      "FS",
+                                      "INCOMINGDIR",
+                                      "$HOME/gnunet-downloads/",
+                                      &final_download_dir);
+  disk_directory_create(ectx, final_download_dir);
   dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)];
   idc.final_download_destination = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
   strcpy(idc.final_download_destination, final_download_dir);
@@ -434,7 +442,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
   list->filename = idc.final_download_destination;
   list->finalName = STRDUP(idc.final_download_destination);
   head = list;
-  size_h = getHumanSize(ECRS_fileSize(idc.uri));
+  size_h = string_get_fancy_byte_size(ECRS_fileSize(idc.uri));
   gtk_tree_store_insert(summary,
                         &iiter,
                         NULL,
@@ -507,7 +515,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
                                       &iter));
   }
   meta = NULL;
-  ECRS_listDirectory(data,
+  ECRS_listDirectory(ectx,
+                     data,
                      size,
                      &meta,
                      &addFilesToDirectory,
@@ -528,9 +537,10 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
   DownloadList * pos;
 
   DEBUG_BEGIN();
-  LOG(LOG_DEBUG,
-      "Download '%s' complete\n",
-      filename);
+  GE_LOG(ectx,
+         GE_STATUS | GE_USER | GE_BULK,
+         _("Download '%s' complete.\n"),
+         filename);
   pos = head;
   while (pos != NULL) {
     if (ECRS_equalsUri(uri,
@@ -544,16 +554,20 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
     if ( (pos->rr != NULL) &&
          (gtk_tree_row_reference_valid(pos->rr)) ) { 
       /* update directory view (if applicable!) */
-      if (OK == getFileSize(filename, &size)) {
-        LOG(LOG_DEBUG,
-            "Updating directory view of '%s'\n",
-            filename);
+      if (OK == disk_file_size(ectx,
+                               filename,
+                               &size,
+                               YES)) {
+        GE_LOG(ectx,
+               GE_DEBUG,
+               "Updating directory view of '%s'\n",
+               filename);
 
         meta = NULL;
-        fd = fileopen(filename, O_RDONLY);
-        if (fd == -1) {
-          LOG_FILE_STRERROR(LOG_ERROR, "open", filename);
-        } else {
+        fd = disk_file_open(ectx,
+                            filename, 
+                            O_RDONLY);
+        if (fd != -1) {
           data = MMAP(NULL,
                       size,
                       PROT_READ,
@@ -561,10 +575,14 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
                       fd,
                       0);
           if (data == MAP_FAILED) {
-            LOG_FILE_STRERROR(LOG_ERROR, "mmap", filename);
+            GE_LOG_STRERROR_FILE(ectx,
+                                 GE_ERROR | GE_ADMIN | GE_BULK,
+                                 "mmap",
+                                 filename);
           } else {
             if (data != NULL) {
-              ECRS_listDirectory(data,
+              ECRS_listDirectory(ectx,
+                                 data,
                                  size,
                                  &meta,
                                  &addFilesToDirectory,
@@ -622,28 +640,20 @@ static int delDownloadView(void * cls,
 }
 
 static void * clearCompletedDownloads(void * unused) {
-  FSUI_clearCompletedDownloads(ctx,
-                               &delDownloadView,
-                               NULL);
+  /* FIXME */
   return NULL;
 }
 
-void on_clearCompletedDownloadsButton_clicked(void * unused,
-                                              GtkWidget * clearButton) {
+void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
+                                                 GtkWidget * clearButton) {
   run_with_save_calls(&clearCompletedDownloads,
                       NULL);
 }
 
-struct aDC_closure {
-  struct ECRS_URI * u;
-  char * fn;
-};
-
 static void * shutdownCode(void * c) {
-  struct aDC_closure * cls = c;
+  struct FSUI_DownloadList * pos = c;
   FSUI_stopDownload(ctx,
-                    cls->u,
-                    cls->fn);
+                    pos);
   return NULL;
 }
 
@@ -651,20 +661,21 @@ static void abortDownloadCallback(GtkTreeModel * model,
                                   GtkTreePath * path,
                                   GtkTreeIter * iter,
                                   GtkTreeStore * tree) {
-  struct aDC_closure cls;
+  void * c;
+  struct ECRS_URI * u;
 
-  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
+  GE_ASSERT(ectx, model == GTK_TREE_MODEL(summary));
   gtk_tree_model_get(model,
                      iter,
-                     DOWNLOAD_URI, &cls.u,
-                     DOWNLOAD_FILENAME, &cls.fn,
+                     DOWNLOAD_POS, &c,
+                     DOWNLOAD_URI, &u,
                      -1);
   run_with_save_calls(&shutdownCode,
-                      &cls);
+                      c);
   gtk_tree_store_remove(summary,
                         iter);
-  if (cls.u != NULL)
-    ECRS_freeUri(cls.u);
+  if (u != NULL)
+    ECRS_freeUri(u);
 }
 
 void on_abortDownloadButton_clicked(void * unused,
@@ -683,14 +694,14 @@ void on_abortDownloadButton_clicked(void * unused,
   DEBUG_END();
 }
 
-static int addDownloadView(void * cls,
-                           const struct FSUI_DownloadList * pos,
-                           const char * filename,
-                           const struct ECRS_URI * uri,
-                           unsigned long long filesize,
-                           unsigned long long bytesCompleted,
-                           int isRecursive,
-                           unsigned int anonymityLevel) {
+int addDownloadView(struct FSUI_DownloadList * pos,
+                    struct FSUI_DownloadList * ppos,
+                    const char * filename,
+                    const struct ECRS_URI * uri,
+                    unsigned long long filesize,
+                    unsigned long long bytesCompleted,
+                    int isRecursive,
+                    unsigned int anonymityLevel) {
   GtkTreeIter iiter;
   int progress;
   char * uriname;
@@ -712,7 +723,7 @@ static int addDownloadView(void * cls,
           (sname[-1] != '/') &&
           (sname[-1] != '\\') )
     sname--;
-  size_h = getHumanSize(filesize);
+  size_h = string_get_fancy_byte_size(filesize);
   gtk_tree_store_set(summary,
                      &iiter,
                      DOWNLOAD_FILENAME, filename,
@@ -731,12 +742,15 @@ static int addDownloadView(void * cls,
 }
 
 
-void fs_download_start() {
+void fs_download_start(struct GE_Context * e,
+                       struct GC_Configuration * c) {
   GtkWidget * downloadList;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
   int col;
 
+  ectx = e;
+  cfg = c;
   DEBUG_BEGIN();
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
@@ -805,10 +819,6 @@ void fs_download_start() {
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
                                               col - 1),
                                               TRUE);
-  FSUI_listDownloads(ctx,
-                     NULL,
-                     &addDownloadView,
-                     NULL);
   DEBUG_END();
 }