X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libdocument%2Fev-file-helpers.c;h=5998e5ea78e0194773869457f447eab4f6d8867e;hb=338612547f506670ca2a805bd399f520c526d87f;hp=45eb3ecbd2e6252929aede8bd14c846a33084400;hpb=40f1be123c6f0d9b7d8a28cf27093948c5ef7f9e;p=evince.git

diff --git a/libdocument/ev-file-helpers.c b/libdocument/ev-file-helpers.c
index 45eb3ecb..5998e5ea 100644
--- a/libdocument/ev-file-helpers.c
+++ b/libdocument/ev-file-helpers.c
@@ -169,17 +169,19 @@ void
 ev_tmp_file_unlink (GFile *file)
 {
 	gboolean res;
+	GError  *error = NULL;
 
 	if (!file)
 		return;
 	
-	res = g_file_delete (file, NULL, NULL);
+	res = g_file_delete (file, NULL, &error);
 	if (!res) {
 		char *uri;
 		
 		uri = g_file_get_uri (file);
-		g_warning ("Unable to delete temp file %s\n", uri);
+		g_warning ("Unable to delete temp file %s: %s\n", uri, error->message);
 		g_free (uri);
+		g_error_free (error);
 	}
 }
 
@@ -232,6 +234,67 @@ ev_xfer_uri_simple (const char *from,
 
 }
 
+static gchar *
+get_mime_type_from_uri (const gchar *uri, GError **error)
+{
+	GFile     *file;
+	GFileInfo *file_info;
+	gchar     *mime_type;
+
+	file = g_file_new_for_uri (uri);
+	file_info = g_file_query_info (file,
+				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
+				       0, NULL, error);
+	g_object_unref (file);
+
+	if (file_info == NULL)
+		return NULL;
+
+	mime_type = g_content_type_get_mime_type (
+			g_file_info_get_content_type (file_info));
+	g_object_unref (file_info);
+
+	return mime_type;
+}
+
+static gchar *
+get_mime_type_from_data (const gchar *uri, GError **error)
+{
+	GFile            *file;
+	GFileInputStream *input_stream;
+	gssize            size_read;
+	guchar            buffer[1024];
+
+	file = g_file_new_for_uri (uri);
+	
+	input_stream = g_file_read (file, NULL, error);
+	if (!input_stream) {
+		g_object_unref (file);
+		return NULL;
+	}
+
+	size_read = g_input_stream_read (G_INPUT_STREAM (input_stream),
+					 buffer, 1024, NULL, NULL);
+	g_input_stream_close (G_INPUT_STREAM (input_stream), NULL, error);
+
+	g_object_unref (file);
+
+	if (size_read == -1)
+		return NULL;
+
+	return g_content_type_guess (NULL, /* no filename */
+				     buffer, 1024,
+				     NULL);
+}
+
+gchar *
+ev_file_get_mime_type (const gchar *uri,
+		       gboolean     fast,
+		       GError     **error)
+{
+	return fast ? get_mime_type_from_uri (uri, error) : get_mime_type_from_data (uri, error);
+}
+
 /* Compressed files support */
 #define BZIPCOMMAND "bzip2"
 #define GZIPCOMMAND "gzip"