X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=backend%2Fcomics%2Fcomics-document.c;h=4d74385a9ecb43061340c8a0047454bb5d00fac0;hb=a90e38bd4aab8013c402e55753275f5b3408e103;hp=3cd6db6b3375a55fa7f2715457e30f086b645509;hpb=75481a7c4d3b557da326c058d7b2d12958f8f018;p=evince.git diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index 3cd6db6b..4d74385a 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-2010 Juanjo Marín * Copyright (C) 2005, Teemu Tervo * * This program is free software; you can redistribute it and/or modify @@ -14,47 +15,66 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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; -}; +#ifdef G_OS_WIN32 +/* On windows g_spawn_command_line_sync reads stdout in O_BINARY mode, not in O_TEXT mode. + * As a consequence, newlines are in a platform dependent representation (\r\n). This + * might be considered a bug in glib. + */ +#define EV_EOL "\r\n" +#else +#define EV_EOL "\n" +#endif typedef enum { RARLABS, GNAUNRAR, UNZIP, - P7ZIP + P7ZIP, + TAR } ComicBookDecompressType; +typedef struct _ComicsDocumentClass ComicsDocumentClass; + +struct _ComicsDocumentClass +{ + EvDocumentClass parent_class; +}; + struct _ComicsDocument { EvDocument parent_instance; gchar *archive, *dir; - GSList *page_names; - gint n_pages; - gchar *selected_command; + GPtrArray *page_names; + gchar *selected_command, *alternative_command; gchar *extract_command, *list_command, *decompress_tmp; gboolean regex_arg; gint offset; @@ -62,26 +82,48 @@ struct _ComicsDocument }; #define OFFSET_7Z 53 +#define OFFSET_ZIP 2 #define NO_OFFSET 0 /* 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. + * @regex_arg: whether the command can accept regex expressions + * @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; + gboolean regex_arg; + gint offset; +} ComicBookDecompressCommand; +static const ComicBookDecompressCommand command_usage_def[] = { + /* RARLABS unrar */ + {"%s p -c- -ierr --", "%s vb -c- -- %s", NULL , FALSE, NO_OFFSET}, -typedef struct _ComicsDocumentClass ComicsDocumentClass; + /* GNA! unrar */ + {NULL , "%s t %s" , "%s -xf %s %s" , FALSE, NO_OFFSET}, + + /* unzip */ + {"%s -p -C --" , "%s %s" , NULL , TRUE , OFFSET_ZIP}, + + /* 7zip */ + {NULL , "%s l -- %s" , "%s x -y %s -o%s", FALSE, OFFSET_7Z}, + + /* tar */ + {"%s -xOf" , "%s -tf %s" , NULL , FALSE, NO_OFFSET} +}; -static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface); static GSList* get_supported_image_extensions (void); static void get_page_size_area_prepared_cb (GdkPixbufLoader *loader, @@ -100,40 +142,60 @@ EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, comics_document_document_thumbnails_iface_init); } ); -static char * -comics_regex_quote (const char *s) +/** + * comics_regex_quote: + * @unquoted_string: a literal string + * + * Quotes a string so unzip will not interpret the regex expressions of + * @unquoted_string. Basically, this functions uses [] to disable regex + * expressions. The return value must be freed with * g_free() + * + * Return value: quoted and disabled-regex string + **/ +static gchar * +comics_regex_quote (const gchar *unquoted_string) { - 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; + const gchar *p; + GString *dest; + + dest = g_string_new ("'"); + + p = unquoted_string; + + while (*p) { + switch (*p) { + /* * matches a sequence of 0 or more characters */ + case ('*'): + /* ? matches exactly 1 charactere */ + case ('?'): + /* [...] matches any single character found inside + * the brackets. Disabling the first bracket is enough. + */ + case ('['): + g_string_append (dest, "["); + g_string_append_c (dest, *p); + g_string_append (dest, "]"); + break; + /* Because \ escapes regex expressions that we are + * disabling for unzip, we need to disable \ too */ + case ('\\'): + g_string_append (dest, "[\\\\]"); + break; + /* Escape single quote inside the string */ + case ('\''): + g_string_append (dest, "'\\''"); + break; + default: + g_string_append_c (dest, *p); + break; + } + ++p; } - *d = *s; - } - - *d++ = '\''; - *d = '\0'; - - return ret; + g_string_append_c (dest, '\''); + return g_string_free (dest, FALSE); } + /* This function manages the command for decompressing a comic book */ static gboolean comics_decompress_temp_dir (const gchar *command_decompress_tmp, @@ -190,54 +252,53 @@ static gboolean comics_generate_command_lines (ComicsDocument *comics_document, GError **error) { - gchar *quoted_file; + gchar *quoted_file, *quoted_file_aux; + gchar *quoted_command; ComicBookDecompressType type; type = comics_document->command_usage; - quoted_file = g_shell_quote (comics_document->archive); - - comics_document->extract_command = - g_strdup_printf (command_usage_def[type].extract, - comics_document->selected_command); - comics_document->list_command = - g_strdup_printf (command_usage_def[type].list, - comics_document->selected_command, - quoted_file); comics_document->regex_arg = command_usage_def[type].regex_arg; + quoted_command = g_shell_quote (comics_document->selected_command); + if (comics_document->regex_arg) { + quoted_file = comics_regex_quote (comics_document->archive); + quoted_file_aux = g_shell_quote (comics_document->archive); + comics_document->list_command = + g_strdup_printf (command_usage_def[type].list, + comics_document->alternative_command, + quoted_file_aux); + g_free (quoted_file_aux); + } else { + quoted_file = g_shell_quote (comics_document->archive); + comics_document->list_command = + g_strdup_printf (command_usage_def[type].list, + quoted_command, quoted_file); + } + comics_document->extract_command = + g_strdup_printf (command_usage_def[type].extract, + quoted_command); 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, + quoted_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, + g_free (quoted_command); + + if (!comics_decompress_temp_dir (comics_document->decompress_tmp, comics_document->selected_command, error)) return FALSE; else return TRUE; } else { g_free (quoted_file); + g_free (quoted_command); return TRUE; } @@ -313,7 +374,10 @@ comics_check_decompress_command (gchar *mime_type, /* InfoZIP's unzip program */ comics_document->selected_command = g_find_program_in_path ("unzip"); - if (comics_document->selected_command) { + comics_document->alternative_command = + g_find_program_in_path ("zipnote"); + if (comics_document->selected_command && + comics_document->alternative_command) { comics_document->command_usage = UNZIP; return TRUE; } @@ -340,6 +404,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, @@ -356,6 +429,13 @@ comics_check_decompress_command (gchar *mime_type, return FALSE; } +static int +sort_page_names (gconstpointer a, + gconstpointer b) +{ + return strcmp (* (const char **) a, * (const char **) b); +} + static gboolean comics_document_load (EvDocument *document, const char *uri, @@ -414,7 +494,8 @@ comics_document_load (EvDocument *document, } /* FIXME: is this safe against filenames containing \n in the archive ? */ - cb_files = g_strsplit (std_out, "\n", 0); + cb_files = g_strsplit (std_out, EV_EOL, 0); + g_free (std_out); if (!cb_files) { @@ -425,6 +506,8 @@ comics_document_load (EvDocument *document, return FALSE; } + comics_document->page_names = g_ptr_array_sized_new (64); + supported_extensions = get_supported_image_extensions (); for (i = 0; cb_files[i] != NULL; i++) { if (comics_document->offset != NO_OFFSET) { @@ -445,12 +528,8 @@ comics_document_load (EvDocument *document, suffix = g_ascii_strdown (suffix + 1, -1); if (g_slist_find_custom (supported_extensions, suffix, (GCompareFunc) strcmp) != NULL) { - comics_document->page_names = - g_slist_insert_sorted ( - comics_document->page_names, - g_strdup (g_strstrip (cb_file)), - (GCompareFunc) strcmp); - comics_document->n_pages++; + g_ptr_array_add (comics_document->page_names, + g_strstrip (g_strdup (cb_file))); } g_free (suffix); } @@ -458,7 +537,7 @@ comics_document_load (EvDocument *document, g_slist_foreach (supported_extensions, (GFunc) g_free, NULL); g_slist_free (supported_extensions); - if (comics_document->n_pages == 0) { + if (comics_document->page_names->len == 0) { g_set_error (error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_INVALID, @@ -466,6 +545,10 @@ comics_document_load (EvDocument *document, uri); return FALSE; } + + /* Now sort the pages */ + g_ptr_array_sort (comics_document->page_names, sort_page_names); + return TRUE; } @@ -483,7 +566,12 @@ comics_document_save (EvDocument *document, static int comics_document_get_n_pages (EvDocument *document) { - return COMICS_DOCUMENT (document)->n_pages; + ComicsDocument *comics_document = COMICS_DOCUMENT (document); + + if (comics_document->page_names == NULL) + return 0; + + return comics_document->page_names->len; } static void @@ -497,7 +585,7 @@ comics_document_get_page_size (EvDocument *document, guchar buf[1024]; gboolean success, got_size = FALSE; gint outpipe = -1; - GPid child_pid = -1; + GPid child_pid; gssize bytes; GdkPixbuf *pixbuf; gchar *filename; @@ -542,10 +630,8 @@ comics_document_get_page_size (EvDocument *document, g_spawn_close_pid (child_pid); g_object_unref (loader); } else { - filename = g_build_filename (comics_document->dir, - (char*) g_slist_nth_data ( - comics_document->page_names, - page->index), + filename = g_build_filename (comics_document->dir, + (char *) comics_document->page_names->pdata[page->index], NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -574,7 +660,7 @@ comics_document_render_pixbuf (EvDocument *document, guchar buf[4096]; gboolean success; gint outpipe = -1; - GPid child_pid = -1; + GPid child_pid; gssize bytes; gint width, height; gchar *filename; @@ -617,9 +703,7 @@ comics_document_render_pixbuf (EvDocument *document, } else { filename = g_build_filename (comics_document->dir, - (char*) g_slist_nth_data ( - comics_document->page_names, - rc->page->index), + (char *) comics_document->page_names->pdata[rc->page->index], NULL); gdk_pixbuf_get_file_info (filename, &width, &height); @@ -704,31 +788,22 @@ 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) { - g_slist_foreach (comics_document->page_names, - (GFunc) g_free, NULL); - g_slist_free (comics_document->page_names); + g_ptr_array_foreach (comics_document->page_names, (GFunc) g_free, NULL); + g_ptr_array_free (comics_document->page_names, TRUE); } g_free (comics_document->archive); g_free (comics_document->selected_command); + g_free (comics_document->alternative_command); g_free (comics_document->extract_command); g_free (comics_document->list_command); G_OBJECT_CLASS (comics_document_parent_class)->finalize (object); } -static EvDocumentInfo * -comics_document_get_info (EvDocument *document) -{ - EvDocumentInfo *info; - info = g_new0 (EvDocumentInfo, 1); - return info; -} - static void comics_document_class_init (ComicsDocumentClass *klass) { @@ -742,7 +817,6 @@ comics_document_class_init (ComicsDocumentClass *klass) ev_document_class->get_n_pages = comics_document_get_n_pages; ev_document_class->get_page_size = comics_document_get_page_size; ev_document_class->render = comics_document_render; - ev_document_class->get_info = comics_document_get_info; } static void @@ -751,7 +825,6 @@ comics_document_init (ComicsDocument *comics_document) comics_document->archive = NULL; comics_document->page_names = NULL; comics_document->extract_command = NULL; - comics_document->n_pages = 0; } /* Returns a list of file extensions supported by gdk-pixbuf */ @@ -818,7 +891,7 @@ comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, } static void -comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) +comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface) { iface->get_thumbnail = comics_document_thumbnails_get_thumbnail; iface->get_dimensions = comics_document_thumbnails_get_dimensions; @@ -832,28 +905,30 @@ extract_argv (EvDocument *document, gint page) char *command_line, *quoted_archive, *quoted_filename; GError *err = NULL; - quoted_archive = g_shell_quote (comics_document->archive); + if (page >= comics_document->page_names->len) + return NULL; + if (comics_document->regex_arg) { - quoted_filename = comics_regex_quote ( - g_slist_nth_data (comics_document->page_names, page)); + quoted_archive = comics_regex_quote (comics_document->archive); + quoted_filename = + comics_regex_quote (comics_document->page_names->pdata[page]); } else { - quoted_filename = g_shell_quote ( - g_slist_nth_data (comics_document->page_names, page)); + quoted_archive = g_shell_quote (comics_document->archive); + 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) { g_warning (_("Error %s"), err->message); g_error_free (err); return NULL; } - + g_free (command_line); g_free (quoted_archive); g_free (quoted_filename);