evince r2881 - in trunk: . libdocument



Author: cosimoc
Date: Wed Jan 30 20:40:34 2008
New Revision: 2881
URL: http://svn.gnome.org/viewvc/evince?rev=2881&view=rev

Log:
2008-01-30  Cosimo Cecchi  <cosimoc svn gnome org>

	* libdocument/ev-document-factory.c:
	(throw_unknown_mime_type_error), (throw_failed_to_get_info_error),
	(get_document_from_uri):

	Use g_content_type_guess () to get mimetype for files.
	Bug #510401.


Modified:
   trunk/ChangeLog
   trunk/libdocument/ev-document-factory.c

Modified: trunk/libdocument/ev-document-factory.c
==============================================================================
--- trunk/libdocument/ev-document-factory.c	(original)
+++ trunk/libdocument/ev-document-factory.c	Wed Jan 30 20:40:34 2008
@@ -103,6 +103,24 @@
 	return EV_COMPRESSION_NONE;
 }
 
+static void
+throw_unknown_mime_type_error (GError **error)
+{
+	g_set_error (error,
+		     EV_DOCUMENT_ERROR,	
+		     0,
+		     _("Unknown MIME Type"));
+}
+
+static void
+throw_failed_to_get_info_error (GError **error)
+{
+	g_set_error (error,
+		     EV_DOCUMENT_ERROR,
+		     0,
+		     _("Failed to get info for document"));
+}
+
 static EvDocument *
 get_document_from_uri (const char        *uri,
 		       gboolean           slow,
@@ -112,7 +130,8 @@
 	EvDocument *document = NULL;
 	GFile *file;
 	GFileInfo *file_info;
-	const gchar *mime_type;
+	const char *mime_type;
+	char *content_type = NULL;
 
 	*compression = EV_COMPRESSION_NONE;
 
@@ -120,22 +139,16 @@
 	file_info = g_file_query_info (file,
 				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
 				       0, NULL, NULL);
-	g_object_unref (file);
 
 	if (file_info == NULL) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,
-			     0,
-			     _("Failed to get info for document"));			
+		throw_failed_to_get_info_error (error);	
 		return NULL;
 	}
+
 	mime_type = g_file_info_get_content_type (file_info);
 
 	if (mime_type == NULL) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,	
-    			     0,
-			     _("Unknown MIME Type"));
+		throw_unknown_mime_type_error (error);
 		g_object_unref (file_info);
 		return NULL;
 	}
@@ -150,17 +163,55 @@
 #endif /* ENABLE_PIXBUF */
 
 	if (document == NULL) {
-		g_set_error (error,
-			     EV_DOCUMENT_ERROR,	
-			     0,
-			     _("Unhandled MIME type: â%sâ"), mime_type);
-		g_object_unref (file_info);
-		return NULL;
+		/* try to sniff mime type from the content */
+		guchar *buffer;
+		gssize size_read;
+		GFileInputStream *input_stream;
+		
+		input_stream = g_file_read (file, NULL, NULL);
+		buffer = g_malloc (1024);
+		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, NULL);
+		g_object_unref (file);
+		if (size_read == -1) {
+			throw_failed_to_get_info_error (error);
+			g_object_unref (file_info);
+			return NULL;
+		} else  {
+			content_type = g_content_type_guess (NULL, /* no filename */
+							     buffer, 1024,
+							     NULL);
+			g_free (buffer);
+			if (content_type == NULL) {
+				throw_unknown_mime_type_error (error);
+				g_object_unref (file_info);
+				return NULL;
+			} else {
+				document = ev_backends_manager_get_document (content_type);
+				if (document == NULL) {
+					g_set_error (error,
+						     EV_DOCUMENT_ERROR,	
+						     0,
+						     _("Unhandled MIME type: â%sâ"), content_type);
+					g_object_unref (file_info);
+					g_free (content_type);
+					return NULL;
+				}
+				mime_type = content_type;
+			}
+		}
+	} else {
+		g_object_unref (file);
 	}
 
 	*compression = get_compression_from_mime_type (mime_type);
 
         g_object_unref (file_info);
+	g_free (content_type);
 	
         return document;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]