1 files changed, 50 insertions, 1 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 2fd3e2b9..639c5a69 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -118,6 +118,9 @@ static void initiateDownload(GtkTreeModel * model,
   const char * name;
   struct stat sbuf;
   unsigned int anon;
+  GtkTreePath *dirTreePath;
+  char *dirPath;
+  unsigned int dirPathLen;
 
   uri = NULL;
   meta = NULL;
@@ -226,6 +229,31 @@ static void initiateDownload(GtkTreeModel * model,
     FREE(pfx);
     pfx = STRDUP(lnk);
   }
+  
+  /* If file is inside a directory, get the full path */
+  dirTreePath = gtk_tree_path_copy(path);
+  dirPath = MALLOC(1);
+  dirPathLen = 0;
+  while (gtk_tree_path_up(dirTreePath)) {
+    const char *dirname;
+    char *new;
+
+    if (!gtk_tree_model_get_iter(model, &iiter, dirTreePath))
+      break;
+    gtk_tree_model_get(model,
+                       &iiter,
+                       SEARCH_NAME, &dirname,
+                       -1);
+    dirPathLen += strlen(dirname) + 1;
+    new = MALLOC(dirPathLen + 1);
+    strcpy(new, dirname);
+    strcat(new, DIR_SEPARATOR_STR);
+    strcat(new, dirPath);
+    FREE(dirPath);
+    dirPath = new;
+  }
+  g_object_unref(dirTreePath);
+  
   list->filename = pfx;
   head = list;
   gtk_tree_store_insert(summary,
@@ -241,6 +269,7 @@ static void initiateDownload(GtkTreeModel * model,
                      DOWNLOAD_URISTRING, filename,
                      DOWNLOAD_URI, ECRS_dupUri(uri),
                      DOWNLOAD_TREEPATH, list->rr, 
+                     DOWNLOAD_DIRPATH, dirPath,
                      /* internal: row reference! */
                      -1);
   FREE(filename);
@@ -326,6 +355,7 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
   GtkTreeIter iter;
   GtkTreePath * path;
   struct ECRS_URI * u;
+  char *dirPath;
    
   pos = head;
   while (pos != NULL) {
@@ -381,6 +411,7 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
                          DOWNLOAD_URI, &u,
                          DOWNLOAD_FILENAME, &fn,
                          DOWNLOAD_LINKNAME, &ln,
+                         DOWNLOAD_DIRPATH, &dirPath,
                          -1);
       if (ECRS_equalsUri(u, uri)) {
         char *dstPath, *newFn, *dstFile;
@@ -394,6 +425,20 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
                            " in section `%s' under `%s'."));
         if (!dstPath)
           return;
+        
+        /* If file is contained in a directory, create directory structure in
+           the file system. */
+        if (dirPath) {
+          unsigned int pathLen = strlen(dirPath);
+          if (pathLen) {
+            pathLen += strlen(dstPath) + 2;
+            dstPath = REALLOC(dstPath, pathLen);
+            strcat(dstPath, DIR_SEPARATOR_STR);
+            strcat(dstPath, dirPath);
+            FREE(dirPath);
+          }
+        }
+          
         mkdirp(dstPath);
                   
         dstFile = MALLOC(strlen(dstPath) + strlen(newFn) + 2);
@@ -575,7 +620,8 @@ void fs_download_start() {
                        G_TYPE_INT,  /* progress */
                        G_TYPE_STRING, /* uri */                      
                        G_TYPE_POINTER,  /* url */
-                       G_TYPE_POINTER); /* internal: gtk tree path / NULL */
+                       G_TYPE_POINTER, /* internal: gtk tree path / NULL */
+                       G_TYPE_POINTER); /* directory path if file is inside a dir */ 
   gtk_tree_view_set_model(GTK_TREE_VIEW(downloadList),
                           GTK_TREE_MODEL(summary));
   renderer = gtk_cell_renderer_progress_new();
@@ -611,6 +657,7 @@ void fs_download_stop() {
   GtkTreeIter iter;
   struct ECRS_URI * u;
   DownloadList * pos;
+  char *dirPath;
 
   /* free URIs in summary model */
   if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
@@ -620,6 +667,7 @@ void fs_download_stop() {
     gtk_tree_model_get(GTK_TREE_MODEL(summary),
                        &iter,
                        DOWNLOAD_URI, &u,
+                       DOWNLOAD_DIRPATH, &dirPath,
                        -1);
     gtk_tree_store_set(summary,
                        &iter,
@@ -627,6 +675,7 @@ void fs_download_stop() {
                        -1);  
     if (u != NULL)
       ECRS_freeUri(u);
+    FREENONNULL(dirPath);
   } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
                                     &iter));
   while (head != NULL) {