diff options
Diffstat (limited to 'src/fs/fs_misc.c')
-rw-r--r-- | src/fs/fs_misc.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index 9fa86a5c4..3a8260d05 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c | |||
@@ -108,44 +108,45 @@ GNUNET_FS_meta_data_suggest_filename (const struct GNUNET_CONTAINER_MetaData | |||
108 | char *base; | 108 | char *base; |
109 | const char *ext; | 109 | const char *ext; |
110 | 110 | ||
111 | ret = GNUNET_CONTAINER_meta_data_get_by_type (md, | 111 | ret = |
112 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); | 112 | GNUNET_CONTAINER_meta_data_get_by_type (md, |
113 | EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME); | ||
113 | if (ret != NULL) | 114 | if (ret != NULL) |
114 | return ret; | 115 | return ret; |
115 | ext = NULL; | 116 | ext = NULL; |
116 | mime = GNUNET_CONTAINER_meta_data_get_by_type (md, | 117 | mime = |
117 | EXTRACTOR_METATYPE_MIMETYPE); | 118 | GNUNET_CONTAINER_meta_data_get_by_type (md, EXTRACTOR_METATYPE_MIMETYPE); |
118 | if (mime != NULL) | 119 | if (mime != NULL) |
119 | { | 120 | { |
120 | i = 0; | 121 | i = 0; |
121 | while ((mimeMap[i][0] != NULL) && (0 != strcmp (mime, mimeMap[i][0]))) | 122 | while ((mimeMap[i][0] != NULL) && (0 != strcmp (mime, mimeMap[i][0]))) |
122 | i++; | 123 | i++; |
123 | if (mimeMap[i][1] == NULL) | 124 | if (mimeMap[i][1] == NULL) |
124 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | | 125 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK, |
125 | GNUNET_ERROR_TYPE_BULK, | ||
126 | _("Did not find mime type `%s' in extension list.\n"), mime); | 126 | _("Did not find mime type `%s' in extension list.\n"), mime); |
127 | else | 127 | else |
128 | ext = mimeMap[i][1]; | 128 | ext = mimeMap[i][1]; |
129 | GNUNET_free (mime); | 129 | GNUNET_free (mime); |
130 | } | 130 | } |
131 | base = GNUNET_CONTAINER_meta_data_get_first_by_types (md, | 131 | base = |
132 | EXTRACTOR_METATYPE_TITLE, | 132 | GNUNET_CONTAINER_meta_data_get_first_by_types (md, |
133 | EXTRACTOR_METATYPE_BOOK_TITLE, | 133 | EXTRACTOR_METATYPE_TITLE, |
134 | EXTRACTOR_METATYPE_ORIGINAL_TITLE, | 134 | EXTRACTOR_METATYPE_BOOK_TITLE, |
135 | EXTRACTOR_METATYPE_PACKAGE_NAME, | 135 | EXTRACTOR_METATYPE_ORIGINAL_TITLE, |
136 | EXTRACTOR_METATYPE_URL, | 136 | EXTRACTOR_METATYPE_PACKAGE_NAME, |
137 | EXTRACTOR_METATYPE_URI, | 137 | EXTRACTOR_METATYPE_URL, |
138 | EXTRACTOR_METATYPE_DESCRIPTION, | 138 | EXTRACTOR_METATYPE_URI, |
139 | EXTRACTOR_METATYPE_ISRC, | 139 | EXTRACTOR_METATYPE_DESCRIPTION, |
140 | EXTRACTOR_METATYPE_JOURNAL_NAME, | 140 | EXTRACTOR_METATYPE_ISRC, |
141 | EXTRACTOR_METATYPE_AUTHOR_NAME, | 141 | EXTRACTOR_METATYPE_JOURNAL_NAME, |
142 | EXTRACTOR_METATYPE_SUBJECT, | 142 | EXTRACTOR_METATYPE_AUTHOR_NAME, |
143 | EXTRACTOR_METATYPE_ALBUM, | 143 | EXTRACTOR_METATYPE_SUBJECT, |
144 | EXTRACTOR_METATYPE_ARTIST, | 144 | EXTRACTOR_METATYPE_ALBUM, |
145 | EXTRACTOR_METATYPE_KEYWORDS, | 145 | EXTRACTOR_METATYPE_ARTIST, |
146 | EXTRACTOR_METATYPE_COMMENT, | 146 | EXTRACTOR_METATYPE_KEYWORDS, |
147 | EXTRACTOR_METATYPE_UNKNOWN, | 147 | EXTRACTOR_METATYPE_COMMENT, |
148 | -1); | 148 | EXTRACTOR_METATYPE_UNKNOWN, |
149 | -1); | ||
149 | if ((base == NULL) && (ext == NULL)) | 150 | if ((base == NULL) && (ext == NULL)) |
150 | return NULL; | 151 | return NULL; |
151 | if (base == NULL) | 152 | if (base == NULL) |