1 files changed, 32 insertions, 97 deletions

diff --git a/src/download.c b/src/download.c
index 0154e9ac..eca922c8 100644
--- a/src/download.c
+++ b/src/download.c
@@ -63,14 +63,6 @@ static int addFilesToDirectory
     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))
@@ -89,7 +81,7 @@ static int addFilesToDirectory
         uri = NULL;
         gtk_tree_model_get(pos->model,
                            &iter,
-                           5, &uri,
+                           SEARCH_URI, &uri,
                            -1);
         if ( (uri != NULL) &&
              (ECRS_equalsUri(uri,
@@ -100,69 +92,10 @@ static int addFilesToDirectory
     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);
+    addEntryToSearchTree(GTK_TREE_STORE(pos->model),
+                         &child,
+                         fi->uri,
+                         fi->meta);
   }
   return OK;
 }
@@ -186,9 +119,9 @@ static void initiateDownload(GtkTreeModel *model,
   name = NULL;
   gtk_tree_model_get(model,
                      iter,
-                     0, &name,
-                     5, &uri,
-                     6, &meta,
+                     SEARCH_NAME, &name,
+                     SEARCH_URI, &uri,
+                     SEARCH_META, &meta,
                      -1);
   if (uri == NULL) {
     BREAK();
@@ -258,12 +191,12 @@ static void initiateDownload(GtkTreeModel *model,
                         0);
   gtk_tree_store_set(summary,
                      &iiter,
-                     0, name,
-                     1, ECRS_fileSize(uri),
-                     2, 0, /* progress */
-                     3, filename,
-                     4, ECRS_dupUri(uri),
-                     5, list->rr, /* internal: row reference! */
+                     DOWNLOAD_FILENAME, name,
+                     DOWNLOAD_SIZE, ECRS_fileSize(uri),
+                     DOWNLOAD_PROGRESS, 0, /* progress */
+                     DOWNLOAD_URISTRING, filename,
+                     DOWNLOAD_URI, ECRS_dupUri(uri),
+                     DOWNLOAD_TREEPATH, list->rr, /* internal: row reference! */
                      -1);
   FREE(filename);
   FREE(name);
@@ -303,8 +236,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
     do {    
       gtk_tree_model_get(GTK_TREE_MODEL(summary),
                          &iter,
-                         1, &total,
-                         4, &u,
+                         DOWNLOAD_SIZE, &total,
+                         DOWNLOAD_URI, &u,
                          -1);
       if (ECRS_equalsUri(u, uri)) {
         if (total != 0)
@@ -313,7 +246,7 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
           val = 100;
         gtk_tree_store_set(GTK_TREE_STORE(summary),
                            &iter,
-                           2, val,
+                           DOWNLOAD_PROGRESS, val,
                            -1);  
         break;
       }
@@ -409,12 +342,12 @@ static int addDownloadView(void * cls,
                         0);
   gtk_tree_store_set(summary,
                      &iiter,
-                     0, filename,
-                     1, filesize,
-                     2, progress,
-                     3, uriname,
-                     4, ECRS_dupUri(uri),
-                     5, NULL,
+                     DOWNLOAD_FILENAME, filename,
+                     DOWNLOAD_SIZE, filesize,
+                     DOWNLOAD_PROGRESS, progress,
+                     DOWNLOAD_URISTRING, uriname,
+                     DOWNLOAD_URI, ECRS_dupUri(uri),
+                     DOWNLOAD_TREEPATH, NULL,
                      -1);
   FREE(uriname);
   return OK;
@@ -430,7 +363,7 @@ void fs_download_start() {
   downloadList = glade_xml_get_widget(mainXML,
                                       "activeDownloadsList");
   summary =
-    gtk_tree_store_new(6,
+    gtk_tree_store_new(DOWNLOAD_NUM,
                        G_TYPE_STRING, /* name */
                        G_TYPE_UINT64,  /* size */
                        G_TYPE_INT,  /* progress */
@@ -444,22 +377,22 @@ void fs_download_start() {
                                               -1,
                                               _("Name"),
                                               renderer,
-                                              "value", 2,
-                                              "text", 0,
+                                              "value", DOWNLOAD_PROGRESS,
+                                              "text", DOWNLOAD_FILENAME,
                                               NULL);
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
                                               -1,
                                               _("Size"),
                                               renderer,
-                                              "text", 1,
+                                              "text", DOWNLOAD_SIZE,
                                               NULL);
   renderer = gtk_cell_renderer_text_new();
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(downloadList),
                                               -1,
                                               _("URI"),
                                               renderer,
-                                              "text", 3,
+                                              "text", DOWNLOAD_URISTRING,
                                               NULL);
   FSUI_listDownloads(ctx,
                      NULL,
@@ -480,13 +413,15 @@ void fs_download_stop() {
   do {    
     gtk_tree_model_get(GTK_TREE_MODEL(summary),
                        &iter,
-                       4, &u,
+                       DOWNLOAD_URI, &u,
                        -1);
     gtk_tree_store_set(GTK_TREE_STORE(summary),
                        &iter,
-                       4, NULL,
+                       DOWNLOAD_URI, NULL,
                        -1);  
     ECRS_freeUri(u);
+    /* FIXME:
+       also free DOWNLOAD_TREEPATH! */
   } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
                                     &iter));
 }