1 files changed, 203 insertions, 24 deletions

diff --git a/src/download.c b/src/download.c
index dca61157..0154e9ac 100644
--- a/src/download.c
+++ b/src/download.c
@@ -36,12 +36,137 @@ typedef struct DL {
   struct ECRS_URI * uri;
   char * filename;
   GtkTreeRowReference * rr;
+  GtkTreeModel * model;
 } DownloadList;
 
 static DownloadList * head;
 
 static GtkTreeStore * summary;
 
+static int addFilesToDirectory
+  (const ECRS_FileInfo * fi,
+   const HashCode512 * key,
+   void * closure) {
+  struct ECRS_URI * uri = closure;
+  DownloadList * pos;
+
+  pos = head;
+  while (pos != NULL) {
+    if (ECRS_equalsUri(uri,
+                       pos->uri)) 
+      break;    
+    pos = pos->next;
+  }
+  if (pos == NULL) {
+    BREAK(); /* odd */
+  } else {
+    GtkTreeIter iter;
+    GtkTreeIter child;
+    int i;
+    unsigned long long size;
+    char * name;
+    char * mime;
+    char * desc;
+    unsigned char * thumb;
+    size_t ts;
+    GdkPixbuf * pixbuf;
+    GdkPixbufLoader * loader;    
+    GtkTreePath * path;
+
+    if (! gtk_tree_row_reference_valid(pos->rr))
+      return SYSERR;
+    path = gtk_tree_row_reference_get_path(pos->rr);
+    gtk_tree_model_get_iter(GTK_TREE_MODEL(pos->model),
+                            &iter,
+                            path);
+    for (i=gtk_tree_model_iter_n_children(pos->model,
+                                          &iter)-1;i>=0;i--) {
+      if (TRUE == gtk_tree_model_iter_nth_child(pos->model,
+                                                &child,
+                                                &iter,
+                                                i)) {
+        struct ECRS_URI * uri;
+        uri = NULL;
+        gtk_tree_model_get(pos->model,
+                           &iter,
+                           5, &uri,
+                           -1);
+        if ( (uri != NULL) &&
+             (ECRS_equalsUri(uri,
+                             fi->uri)) ) 
+          return OK;      
+      }
+    }
+    gtk_tree_store_append(GTK_TREE_STORE(pos->model),
+                          &child,
+                          &iter);
+    
+    /* FIXME: this code is identical to some
+       code in search.c -- refactor into one
+       function (on model, iter and fi) */
+    mime = ECRS_getFromMetaData(fi->meta,
+                                EXTRACTOR_MIMETYPE);
+    if (mime == NULL)
+      mime = STRDUP(_("unknown"));
+    desc = ECRS_getFirstFromMetaData(fi->meta,
+                                     EXTRACTOR_DESCRIPTION,
+                                     EXTRACTOR_GENRE,
+                                     EXTRACTOR_ALBUM,
+                                     EXTRACTOR_COMMENT,
+                                     EXTRACTOR_SUBJECT,
+                                     EXTRACTOR_FORMAT,
+                                     EXTRACTOR_SIZE,
+                                     EXTRACTOR_KEYWORDS,
+                                     -1);
+    if (desc == NULL)
+      desc = STRDUP(_(""));
+    name = ECRS_getFirstFromMetaData(fi->meta,
+                                     EXTRACTOR_FILENAME,
+                                     EXTRACTOR_TITLE,
+                                     EXTRACTOR_ARTIST,
+                                     EXTRACTOR_AUTHOR,
+                                     EXTRACTOR_PUBLISHER,
+                                     EXTRACTOR_CREATOR,
+                                     EXTRACTOR_PRODUCER,
+                                     EXTRACTOR_UNKNOWN,
+                                     -1);
+    if (name == NULL)
+      name = STRDUP(_("no name given")); 
+    size = ECRS_fileSize(fi->uri);
+    thumb = NULL;
+    ts = ECRS_getThumbnailFromMetaData(fi->meta,
+                                       &thumb);
+    if (ts != 0) {
+      loader = gdk_pixbuf_loader_new();
+      gdk_pixbuf_loader_write(loader,
+                              (const guchar*) thumb,
+                              ts,
+                              NULL);    
+      pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+      gdk_pixbuf_loader_close(loader,
+                              NULL);
+      } else {
+      pixbuf = NULL;
+    }
+    gtk_tree_store_set(GTK_TREE_STORE(pos->model),
+                       &child,
+                       0, name,
+                       1, size,
+                       2, mime,
+                       3, desc,
+                       4, pixbuf,
+                       5, ECRS_dupUri(fi->uri),
+                       6, ECRS_dupMetaData(fi->meta),
+                       7, NULL, /* internal */
+                       -1);
+    FREE(mime);
+    FREE(desc);
+    FREE(name);
+    FREENONNULL(thumb);
+  }
+  return OK;
+}
+
 static void initiateDownload(GtkTreeModel *model,
                              GtkTreePath * path,
                              GtkTreeIter * iter,
@@ -85,8 +210,11 @@ static void initiateDownload(GtkTreeModel *model,
   list = MALLOC(sizeof(DownloadList));
   list->next = head;
   list->rr = NULL;
-  if (ECRS_isDirectory(meta))
+  list->model = NULL;
+  if (ECRS_isDirectory(meta)) {
     list->rr = gtk_tree_row_reference_new(model, path);
+    list->model = model;
+  }
   list->uri = ECRS_dupUri(uri);
   fn = getFileName("FS",
                    "DOWNLOADDIR",
@@ -160,35 +288,46 @@ void on_downloadButton_clicked(GtkWidget * treeview,
 /**
  */
 void displayDownloadUpdate(const struct ECRS_URI * uri,
-                           unsigned long long completed) {
+                           unsigned long long completed,
+                           const char * data,
+                           unsigned int size) {
   GtkTreeIter iter;
   unsigned int val;
   unsigned long long total;
   struct ECRS_URI * u;
+  struct ECRS_MetaData * meta;
+  
 
-  if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
-                                      &iter))
-    return;
-  do {    
-    
-    gtk_tree_model_get(GTK_TREE_MODEL(summary),
-                       &iter,
-                       1, &total,
-                       4, &u,
-                       -1);
-    if (ECRS_equalsUri(u, uri)) {
-      if (total != 0)
-        val = completed * 100 / total;
-      else
-        val = 100;
-      gtk_tree_store_set(GTK_TREE_STORE(summary),
+  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
+                                    &iter)) {
+    do {    
+      gtk_tree_model_get(GTK_TREE_MODEL(summary),
                          &iter,
-                         2, val,
-                         -1);  
-      break;
-    }
-  } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
-                                    &iter));
+                         1, &total,
+                         4, &u,
+                         -1);
+      if (ECRS_equalsUri(u, uri)) {
+        if (total != 0)
+          val = completed * 100 / total;
+        else
+          val = 100;
+        gtk_tree_store_set(GTK_TREE_STORE(summary),
+                           &iter,
+                           2, val,
+                           -1);  
+        break;
+      }
+    } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
+                                      &iter));
+  }
+  meta = NULL;
+  ECRS_listDirectory(data,
+                     size,
+                     &meta,
+                     &addFilesToDirectory,
+                     (void*)uri);
+  if (meta != NULL)
+    ECRS_freeMetaData(meta);
 }
 
 /**
@@ -196,6 +335,19 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
 void displayDownloadComplete(const struct ECRS_URI * uri,
                              const char * filename) {
   char * ren;
+  unsigned long long size;
+  char * data;
+  int fd;
+  struct ECRS_MetaData * meta;
+  DownloadList * pos;
+
+  pos = head;
+  while (pos != NULL) {
+    if (ECRS_equalsUri(uri,
+                       pos->uri)) 
+      break;    
+    pos = pos->next;
+  }
 
   ren = ECRS_suggestFilename(filename);
   if (ren == NULL)
@@ -207,9 +359,35 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
   }
   FREE(ren);
   /* fixme: also update download model? */
+  /* update directory view (if applicable!) */
+  if ( (pos != NULL) &&
+       (pos->rr != NULL) ) {
+    size = getFileSize(filename);
+    fd = fileopen(filename, O_RDONLY);
+    data = MMAP(NULL,
+                size,
+                PROT_READ,
+                MAP_SHARED,
+                fd,
+                0);
+    meta = NULL;
+    if (data != NULL) {
+      ECRS_listDirectory(data,
+                         size,
+                         &meta,
+                         &addFilesToDirectory,
+                         (void*)uri);
+      MUNMAP(data, size);
+    }
+    CLOSE(fd);
+    if (meta != NULL)
+      ECRS_freeMetaData(meta);
+  }
+
 }
 
 static int addDownloadView(void * cls,
+                           const struct FSUI_DownloadList * pos,
                            const char * filename,
                            const struct ECRS_URI * uri,
                            unsigned long long filesize,
@@ -284,6 +462,7 @@ void fs_download_start() {
                                               "text", 3,
                                               NULL);
   FSUI_listDownloads(ctx,
+                     NULL,
                      &addDownloadView,
                      NULL);
 }