X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fcomics%2Fcomics-document.c;h=6ea6a7a1cdc741a165834c8eac6e1d22217ed1e3;hb=feeec13cf60423b15059f5e30cf3fb5763cd3922;hp=127943d135353b51558b51be5510a3e3e72a5a58;hpb=0c06dc4d1656051c9613973e8bef9c7dbfaa151d;p=evince.git

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 127943d1..6ea6a7a1 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -109,10 +109,8 @@ comics_document_load (EvDocument *document,
 {
 	ComicsDocument *comics_document = COMICS_DOCUMENT (document);
 	GSList *supported_extensions;
-	GFile *file;
-	GFileInfo *file_info;
 	gchar *list_files_command = NULL, *std_out, *quoted_file;
-	const gchar *mime_type = NULL;
+	gchar *mime_type;
 	gchar **cbr_files;
 	gboolean success;
 	int i, retval;
@@ -121,32 +119,33 @@ comics_document_load (EvDocument *document,
 	g_return_val_if_fail (comics_document->archive != NULL, FALSE);
 
 	quoted_file = g_shell_quote (comics_document->archive);
-	file = g_file_new_for_uri (uri);
-	file_info = g_file_query_info (file,
-				       G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-				       0, NULL, NULL);
-	if (file_info != NULL) {
-		mime_type = g_file_info_get_content_type (file_info);
-	}
-	g_object_unref (file);
+	mime_type = ev_file_get_mime_type (uri, FALSE, NULL);
 
 	/* FIXME, use proper cbr/cbz mime types once they're
 	 * included in shared-mime-info */
-	if (!strcmp (mime_type, "application/x-cbr")) {
+	if (!strcmp (mime_type, "application/x-cbr") ||
+	    !strcmp (mime_type, "application/x-rar")) {
 		comics_document->extract_command =
 			g_strdup ("unrar p -c- -ierr");
 		list_files_command =
 			g_strdup_printf ("unrar vb -c- -- %s", quoted_file);
 		comics_document->regex_arg = FALSE;
-	} else if (!strcmp (mime_type, "application/x-cbz")) {
+	} else if (!strcmp (mime_type, "application/x-cbz") ||
+		   !strcmp (mime_type, "application/x-zip")) {
 		comics_document->extract_command =
 			g_strdup ("unzip -p -C");
 		list_files_command = 
 			g_strdup_printf ("zipinfo -1 -- %s", quoted_file);
 		comics_document->regex_arg = TRUE;
+	} else if (!strcmp (mime_type, "application/x-cb7")) {
+		comics_document->extract_command =
+			g_strdup ("7zr x -so");
+		list_files_command = 
+			g_strdup_printf ("7zr l -- %s", quoted_file);
+		comics_document->regex_arg = TRUE;
 	}
 
-	g_object_unref (file_info);
+	g_free (mime_type);
 	g_free (quoted_file);
 
 	/* Get list of files in archive */
@@ -221,7 +220,7 @@ comics_document_get_n_pages (EvDocument *document)
 
 static void
 comics_document_get_page_size (EvDocument *document,
-			       int         page,
+			       EvPage     *page,
 			       double     *width,
 			       double     *height)
 {
@@ -232,7 +231,7 @@ comics_document_get_page_size (EvDocument *document,
 	gint outpipe = -1;
 	GPid child_pid = -1;
 
-	argv = extract_argv (document, page);
+	argv = extract_argv (document, page->index);
 	success = g_spawn_async_with_pipes (NULL, argv, NULL,
 					    G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
 					    NULL, NULL,
@@ -290,7 +289,7 @@ comics_document_render_pixbuf (EvDocument      *document,
 	gint outpipe = -1;
 	GPid child_pid = -1;
 
-	argv = extract_argv (document, rc->page);
+	argv = extract_argv (document, rc->page->index);
 	success = g_spawn_async_with_pipes (NULL, argv, NULL,
 					    G_SPAWN_SEARCH_PATH
 					    | G_SPAWN_STDERR_TO_DEV_NULL,