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=b82569bb39b04d1689f630a42112a71af7bbb355;hb=e732e45fbf5930d8c3ac2471ff8912f41152ec7a;hp=fbe6ba01c99c047ba52a70958fe02b976868d8e2;hpb=6635e60321ca8e4607c30f3303742ca2df559b3c;p=evince.git diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index fbe6ba01..b82569bb 100644 --- a/backend/comics/comics-document.c +++ b/backend/comics/comics-document.c @@ -1,5 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */ /* + * Copyright (C) 2009, Juanjo Marín * Copyright (C) 2005, Teemu Tervo * * This program is free software; you can redistribute it and/or modify @@ -17,36 +18,46 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "config.h" - #include + #include #include +#include +#include + +#include #include #include #include -#include -#include -#include + +#ifdef G_OS_WIN32 +# define WIFEXITED(x) ((x) != 3) +# define WEXITSTATUS(x) (x) +#else +# include +#endif #include "comics-document.h" #include "ev-document-misc.h" #include "ev-document-thumbnails.h" #include "ev-file-helpers.h" -struct _ComicsDocumentClass -{ - EvDocumentClass parent_class; -}; - typedef enum { RARLABS, GNAUNRAR, UNZIP, - P7ZIP + P7ZIP, + TAR } ComicBookDecompressType; +typedef struct _ComicsDocumentClass ComicsDocumentClass; + +struct _ComicsDocumentClass +{ + EvDocumentClass parent_class; +}; + struct _ComicsDocument { EvDocument parent_instance; @@ -55,7 +66,6 @@ struct _ComicsDocument GPtrArray *page_names; gchar *selected_command; gchar *extract_command, *list_command, *decompress_tmp; - gboolean regex_arg; gint offset; ComicBookDecompressType command_usage; }; @@ -66,19 +76,38 @@ struct _ComicsDocument /* For perfomance reasons of 7z* we've choosen to decompress on the temporary * directory instead of decompressing on the stdout */ -struct { - char *extract, *list, *decompress_tmp; - gboolean regex_arg; - gint offset; -} command_usage_def[] = { - {"%s p -c- -ierr", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, - {NULL , "%s t %s" , "%s -xf %s %s" , TRUE , NO_OFFSET}, - {"%s -p -C" , "%s -Z -1 -- %s" , NULL , TRUE , NO_OFFSET}, - {NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z} -}; +/** + * @extract: command line arguments to pass to extract a file from the archive + * to stdout. + * @list: command line arguments to list the archive contents + * @decompress_tmp: command line arguments to pass to extract the archive + * into a directory. + * @offset: the position offset of the filename on each line in the output of + * running the @list command + */ +typedef struct { + char *extract; + char *list; + char *decompress_tmp; + gint offset; +} ComicBookDecompressCommand; +static const ComicBookDecompressCommand command_usage_def[] = { + /* RARLABS unrar */ + {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , NO_OFFSET}, -typedef struct _ComicsDocumentClass ComicsDocumentClass; + /* GNA! unrar */ + {NULL , "%s t %s" , "%s -xf %s %s" , NO_OFFSET}, + + /* unzip */ + {"%s -p -C --" , "%s -Z -1 -- %s" , NULL , NO_OFFSET}, + + /* 7zip */ + {NULL , "%s l -- %s" , "%s x -y %s -o%s", OFFSET_7Z}, + + /* tar */ + {"%s -xOf" , "%s -tf %s" , NULL , NO_OFFSET} +}; static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); @@ -99,39 +128,6 @@ EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, comics_document_document_thumbnails_iface_init); } ); -static char * -comics_regex_quote (const char *s) -{ - char *ret, *d; - - d = ret = g_malloc (strlen (s) * 4 + 3); - - *d++ = '\''; - - for (; *s; s++, d++) { - switch (*s) { - case '?': - case '|': - case '[': - case ']': - case '*': - case '\\': - *d++ = '\\'; - break; - case '\'': - *d++ = '\''; - *d++ = '\\'; - *d++ = '\''; - break; - } - *d = *s; - } - - *d++ = '\''; - *d = '\0'; - - return ret; -} /* This function manages the command for decompressing a comic book */ static gboolean @@ -202,35 +198,22 @@ comics_generate_command_lines (ComicsDocument *comics_document, g_strdup_printf (command_usage_def[type].list, comics_document->selected_command, quoted_file); - comics_document->regex_arg = command_usage_def[type].regex_arg; comics_document->offset = command_usage_def[type].offset; if (command_usage_def[type].decompress_tmp) { - comics_document->dir = ev_tmp_directory (NULL); - comics_document->decompress_tmp = + comics_document->dir = ev_mkdtemp ("evince-comics-XXXXXX", error); + if (comics_document->dir == NULL) + return FALSE; + + /* unrar-free can't create directories, but ev_mkdtemp already created the dir */ + + comics_document->decompress_tmp = g_strdup_printf (command_usage_def[type].decompress_tmp, comics_document->selected_command, quoted_file, comics_document->dir); g_free (quoted_file); - /* unrar-free can't create directories so we do it on its - * behalf */ - if (type == GNAUNRAR) { - if (g_mkdir_with_parents (comics_document->dir, 0700) != - 0) { - int errsv = errno; - g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("Failed to create a temporary " - "directory.")); - g_warning ("Failed to create directory %s: %s", - comics_document->dir, - g_strerror (errsv)); - - return FALSE; - } - } - if (!comics_decompress_temp_dir (comics_document->decompress_tmp, + + if (!comics_decompress_temp_dir (comics_document->decompress_tmp, comics_document->selected_command, error)) return FALSE; else @@ -339,6 +322,15 @@ comics_check_decompress_command (gchar *mime_type, comics_document->command_usage = P7ZIP; return TRUE; } + } else if (!strcmp (mime_type, "application/x-cbt") || + !strcmp (mime_type, "application/x-tar")) { + /* tar utility (Tape ARchive) */ + comics_document->selected_command = + g_find_program_in_path ("tar"); + if (comics_document->selected_command) { + comics_document->command_usage = TAR; + return TRUE; + } } else { g_set_error (error, EV_DOCUMENT_ERROR, @@ -713,7 +705,6 @@ comics_document_finalize (GObject *object) g_warning (_("There was an error deleting “%s”."), comics_document->dir); g_free (comics_document->dir); - g_remove (ev_tmp_dir ()); } if (comics_document->page_names) { @@ -834,17 +825,12 @@ extract_argv (EvDocument *document, gint page) return NULL; quoted_archive = g_shell_quote (comics_document->archive); - if (comics_document->regex_arg) { - quoted_filename = comics_regex_quote (comics_document->page_names->pdata[page]); - } else { - quoted_filename = g_shell_quote (comics_document->page_names->pdata[page]); - } + quoted_filename = g_shell_quote (comics_document->page_names->pdata[page]); - command_line = g_strdup_printf ("%s -- %s %s", + command_line = g_strdup_printf ("%s %s %s", comics_document->extract_command, quoted_archive, quoted_filename); - g_shell_parse_argv (command_line, NULL, &argv, &err); if (err) {