EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document,
{
- G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
- comics_document_document_thumbnails_iface_init);
+ EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
+ comics_document_document_thumbnails_iface_init);
} );
static char *
{
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;
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/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 */
static void
comics_document_get_page_size (EvDocument *document,
- int page,
+ EvPage *page,
double *width,
double *height)
{
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,
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,