2008-11-29 Carlos Garcia Campos <carlosgc@gnome.org>
* backend/comics/comics-document.c: (comics_document_load):
Do not trust file extensions when getting the command needed to
uncompress comic documents. Fixes bug #562143.
svn path=/trunk/; revision=3280
+2008-11-29 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * backend/comics/comics-document.c: (comics_document_load):
+
+ Do not trust file extensions when getting the command needed to
+ uncompress comic documents. Fixes bug #562143.
+
2008-11-29 Carlos Garcia Campos <carlosgc@gnome.org>
* libdocument/ev-document-factory.c: (get_document_from_uri),
2008-11-29 Carlos Garcia Campos <carlosgc@gnome.org>
* libdocument/ev-document-factory.c: (get_document_from_uri),
{
ComicsDocument *comics_document = COMICS_DOCUMENT (document);
GSList *supported_extensions;
{
ComicsDocument *comics_document = COMICS_DOCUMENT (document);
GSList *supported_extensions;
- GFile *file;
- GFileInfo *file_info;
gchar *list_files_command = NULL, *std_out, *quoted_file;
gchar *list_files_command = NULL, *std_out, *quoted_file;
- const gchar *mime_type = NULL;
gchar **cbr_files;
gboolean success;
int i, retval;
gchar **cbr_files;
gboolean success;
int i, retval;
g_return_val_if_fail (comics_document->archive != NULL, FALSE);
quoted_file = g_shell_quote (comics_document->archive);
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 */
/* 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;
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 =
comics_document->extract_command =
g_strdup ("unzip -p -C");
list_files_command =
comics_document->regex_arg = TRUE;
}
comics_document->regex_arg = TRUE;
}
- g_object_unref (file_info);
g_free (quoted_file);
/* Get list of files in archive */
g_free (quoted_file);
/* Get list of files in archive */