-use gnunet-original filename for metatypes for consistency

7 files changed, 71 insertions, 77 deletions

diff --git a/src/fs/gnunet-fs-gtk_common.c b/src/fs/gnunet-fs-gtk_common.c
index 52ad1595..af9284bc 100644
--- a/src/fs/gnunet-fs-gtk_common.c
+++ b/src/fs/gnunet-fs-gtk_common.c
@@ -231,4 +231,45 @@ GNUNET_FS_GTK_mmap_and_scan (const char *filename,
   GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh));
 }
 
+
+/**
+ * Obtain the string we will use to describe a search result from
+ * the respective meta data.
+ *
+ * @param meta meta data to inspect
+ * @return description of the result in utf-8, never NULL
+ */
+char *
+GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
+{
+  char *desc;
+  char *utf8_desc;
+
+  desc =
+      GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
+                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
+                                                     EXTRACTOR_METATYPE_TITLE,
+                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
+                                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+                                                     EXTRACTOR_METATYPE_FILENAME,
+                                                     EXTRACTOR_METATYPE_DESCRIPTION,
+                                                     EXTRACTOR_METATYPE_SUMMARY,
+                                                     EXTRACTOR_METATYPE_ALBUM,
+                                                     EXTRACTOR_METATYPE_COMMENT,
+                                                     EXTRACTOR_METATYPE_SUBJECT,
+                                                     EXTRACTOR_METATYPE_KEYWORDS,
+                                                     -1);
+  if (desc == NULL)
+    return GNUNET_strdup (_("no description supplied"));
+  utf8_desc =
+    GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+                                        strlen (desc) + 1);
+  GNUNET_free (desc);
+  if (utf8_desc == NULL)
+    return GNUNET_strdup (_("no description supplied"));
+  return utf8_desc;
+}
+
+
+
 /* end of gnunet-fs-gtk-common.c */
diff --git a/src/fs/gnunet-fs-gtk_common.h b/src/fs/gnunet-fs-gtk_common.h
index 98d4c5e2..746c3fc3 100644
--- a/src/fs/gnunet-fs-gtk_common.h
+++ b/src/fs/gnunet-fs-gtk_common.h
@@ -122,5 +122,16 @@ GNUNET_FS_GTK_dubious_meta_to_utf8 (enum EXTRACTOR_MetaFormat format,
                                     const char *data, size_t data_len);
 
 
+
+/**
+ * Obtain the string we will use to describe a search result from
+ * the respective meta data.
+ *
+ * @param meta meta data to inspect
+ * @return description of the result in utf-8, never NULL
+ */
+char *
+GNUNET_FS_GTK_get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta);
+
 #endif
 /* end of gnunet-fs-gtk-common.h */
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index a7aef9ba..32fc4e88 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "gnunet-fs-gtk.h"
+#include "gnunet-fs-gtk_common.h"
 #include "gnunet-fs-gtk_download-save-as.h"
 #include "gnunet-fs-gtk_event-handler.h"
 
@@ -424,6 +425,10 @@ start_download (GtkTreeView *tree_view,
   dc->anonymity = anonymity;
   dc->is_recursive = is_recursive;
   dc->tab = tab;
+  fprintf (stderr,
+           "lp %d, have-sug: %d\n",
+           local_parents,
+           have_a_suggestion);
   if ( (GNUNET_YES == local_parents) &&
        (GNUNET_YES == have_a_suggestion) )
     /* Skip the dialog, call directly */
@@ -1099,44 +1104,6 @@ handle_search_error (struct SearchTab *tab,
 
 
 /**
- * Obtain the string we will use to describe a search result from
- * the respective meta data.
- *
- * @param meta meta data to inspect
- * @return description of the result in utf-8, never NULL
- */
-static char *
-get_description_from_metadata (const struct GNUNET_CONTAINER_MetaData *meta)
-{
-  char *desc;
-  char *utf8_desc;
-
-  desc =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
-                                                     EXTRACTOR_METATYPE_TITLE,
-                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                     EXTRACTOR_METATYPE_FILENAME,
-                                                     EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
-                                                     EXTRACTOR_METATYPE_ALBUM,
-                                                     EXTRACTOR_METATYPE_COMMENT,
-                                                     EXTRACTOR_METATYPE_SUBJECT,
-                                                     EXTRACTOR_METATYPE_KEYWORDS,
-                                                     -1);
-  if (desc == NULL)
-    return GNUNET_strdup (_("no description supplied"));
-  utf8_desc =
-    GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
-                                        strlen (desc) + 1);
-  GNUNET_free (desc);
-  if (utf8_desc == NULL)
-    return GNUNET_strdup (_("no description supplied"));
-  return utf8_desc;
-}
-
-
-/**
  * Obtain the mime type (or format description) will use to describe a search result from
  * the respective meta data.
  *
@@ -1192,7 +1159,7 @@ update_search_result (struct SearchResult *sr,
               "Updating search result SR=%p with %d, %u, %u\n",
               sr, availability_rank,
               availability_certainty, applicability_rank);
-  desc = get_description_from_metadata (meta);
+  desc = GNUNET_FS_GTK_get_description_from_metadata (meta);
   mime = get_mimetype_from_metadata (meta);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
   tp = gtk_tree_row_reference_get_path (sr->rr);
@@ -1304,7 +1271,7 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab,
     }
     uris = GNUNET_FS_uri_to_string (uri);
   }
-  desc = get_description_from_metadata (meta);
+  desc = GNUNET_FS_GTK_get_description_from_metadata (meta);
   pixbuf = GNUNET_FS_GTK_get_thumbnail_from_meta_data (meta);
 
   sr = GNUNET_malloc (sizeof (struct SearchResult));
diff --git a/src/fs/gnunet-fs-gtk_open-directory.c b/src/fs/gnunet-fs-gtk_open-directory.c
index fb6bfec2..d73a5846 100644
--- a/src/fs/gnunet-fs-gtk_open-directory.c
+++ b/src/fs/gnunet-fs-gtk_open-directory.c
@@ -86,7 +86,7 @@ add_child (void *cls, const char *filename, const struct GNUNET_FS_Uri *uri,
 
     dmeta = GNUNET_CONTAINER_meta_data_duplicate (meta);
     GNUNET_CONTAINER_meta_data_insert (dmeta, "<user>",
-                                       EXTRACTOR_METATYPE_FILENAME,
+                                       EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                        EXTRACTOR_METAFORMAT_UTF8, "text/plain",
                                        acc->filename,
                                        strlen (acc->filename) + 1);
diff --git a/src/fs/gnunet-fs-gtk_publish-dialog.c b/src/fs/gnunet-fs-gtk_publish-dialog.c
index 20a05400..757958be 100644
--- a/src/fs/gnunet-fs-gtk_publish-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-dialog.c
@@ -389,7 +389,7 @@ create_dir_at_iter (struct MainPublishingDialogContext *ctx,
   meta = GNUNET_CONTAINER_meta_data_create ();
   GNUNET_FS_meta_data_make_directory (meta);
   GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet-gtk>",
-                                     EXTRACTOR_METATYPE_FILENAME,
+                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
                                      EXTRACTOR_METAFORMAT_UTF8, "text/plain",
                                      name, strlen (name) + 1);
   gtk_tree_store_insert_before (GTK_TREE_STORE (ctx->file_info_treemodel), pos, iter, NULL);
@@ -1839,32 +1839,7 @@ add_updateable_to_ts (void *cls, const char *last_id,
   GNUNET_CONTAINER_multihashmap_put (uc->seen, &hc, "dummy",
                                      GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
   /* FIXME-BUG-MAYBE: what if this put fails?  Not convinced it cannot... */
-  desc =
-      GNUNET_CONTAINER_meta_data_get_first_by_types (last_meta,
-                                                     EXTRACTOR_METATYPE_DESCRIPTION,
-                                                     EXTRACTOR_METATYPE_TITLE,
-                                                     EXTRACTOR_METATYPE_BOOK_TITLE,
-                                                     EXTRACTOR_METATYPE_FILENAME,
-                                                     EXTRACTOR_METATYPE_SUMMARY,
-                                                     EXTRACTOR_METATYPE_ALBUM,
-                                                     EXTRACTOR_METATYPE_COMMENT,
-                                                     EXTRACTOR_METATYPE_SUBJECT,
-                                                     -1);
-  if (desc == NULL)
-    desc = GNUNET_strdup (_("no description supplied"));
-  else
-  {
-    char *utf8_desc = NULL;
-
-    utf8_desc =
-        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
-                                            strlen (desc) + 1);
-    GNUNET_free (desc);
-    if (utf8_desc != NULL)
-      desc = utf8_desc;
-    else
-      desc = NULL;
-  }
+  desc = GNUNET_FS_GTK_get_description_from_metadata (last_meta);
   gtk_tree_store_insert_with_values (uc->ts, &iter, uc->parent, G_MAXINT, 0,
                                      uc->namespace_name, 1, uc->ns, 2, last_id,
                                      3, GNUNET_FS_uri_dup (last_uri), 4,
diff --git a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
index 53ad9e51..e2056170 100644
--- a/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
+++ b/src/fs/gnunet-fs-gtk_publish-edit-dialog.c
@@ -374,7 +374,7 @@ GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb (GtkCell
 
   gtk_tree_model_get (GTK_TREE_MODEL (ctx->meta_liststore), &iter, 
                       0, &metatype, -1);
-  if (metatype == EXTRACTOR_METATYPE_FILENAME) 
+  if (metatype == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
   {
     /* apply filename rules */
     /* First, use UNIX-style separators */
@@ -975,7 +975,7 @@ set_window_title_to_filename (void *cls,
 {
   char *utf8;
 
-  if (EXTRACTOR_METATYPE_FILENAME != type)
+  if (EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME != type)
     return 0;
   utf8 = GNUNET_FS_GTK_dubious_meta_to_utf8 (format,
                                              data, data_len);
diff --git a/src/fs/metatypes.c b/src/fs/metatypes.c
index 2b9185f4..5e9cba98 100644
--- a/src/fs/metatypes.c
+++ b/src/fs/metatypes.c
@@ -2,7 +2,7 @@
 
 gint types_generic[] = {
   EXTRACTOR_METATYPE_MIMETYPE, 
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS, 
   EXTRACTOR_METATYPE_SUBJECT,
@@ -19,7 +19,7 @@ gint types_generic[] = {
 gint types_text[] = 
 { 
   EXTRACTOR_METATYPE_MIMETYPE, 
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_ABSTRACT,
@@ -65,7 +65,7 @@ gint types_text[] =
 gint types_music[] = 
 {                    
   EXTRACTOR_METATYPE_MIMETYPE,
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_ARTIST, 
   EXTRACTOR_METATYPE_COMPOSER, 
@@ -108,7 +108,7 @@ gint types_music[] =
 gint types_video[] = 
 {
   EXTRACTOR_METATYPE_MIMETYPE, 
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_GENRE,
   EXTRACTOR_METATYPE_KEYWORDS,
@@ -140,7 +140,7 @@ gint types_video[] =
 gint types_image[] = 
 {
   EXTRACTOR_METATYPE_MIMETYPE, 
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_KEYWORDS,
   EXTRACTOR_METATYPE_DESCRIPTION,
@@ -163,7 +163,7 @@ gint types_image[] =
 gint types_namespace[] =
 {                               /* Namespace */
   EXTRACTOR_METATYPE_MIMETYPE,
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_COMMENT,
   EXTRACTOR_METATYPE_TITLE,
   EXTRACTOR_METATYPE_DESCRIPTION,
@@ -186,7 +186,7 @@ gint types_namespace[] =
 gint types_software[] = 
 { 
   EXTRACTOR_METATYPE_MIMETYPE, 
-  EXTRACTOR_METATYPE_FILENAME,
+  EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
   EXTRACTOR_METATYPE_PACKAGE_NAME, 
   EXTRACTOR_METATYPE_PACKAGE_VERSION,
   EXTRACTOR_METATYPE_TARGET_ARCHITECTURE,