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=0481de864b586ce7e118820fddd422a4d0907c4d;hb=212d9a536bc60e711b779feb5e8aa33db654997d;hp=3825074aac7643be36717915a0928ec4b8c0a3c3;hpb=d25c6d97b5112ad8da7fedfd427da35c6b7bf3b7;p=evince.git diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c index 3825074a..0481de86 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,112 @@ * * 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" +#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, + TAR +} ComicBookDecompressType; + +typedef struct _ComicsDocumentClass ComicsDocumentClass; + struct _ComicsDocumentClass { - GObjectClass parent_class; + EvDocumentClass parent_class; }; struct _ComicsDocument { - GObject parent_instance; + EvDocument parent_instance; gchar *archive, *dir; - GSList *page_names; - gint n_pages; - gchar *selected_command; - gchar *extract_command, *list_command; - gboolean regex_arg, flag_temp, flag_FLOSS; + GPtrArray *page_names; + gchar *selected_command, *alternative_command; + gchar *extract_command, *list_command, *decompress_tmp; + gboolean regex_arg; + gint offset; + ComicBookDecompressType command_usage; }; -typedef struct _ComicsDocumentClass ComicsDocumentClass; +#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 */ -static void comics_document_document_iface_init (EvDocumentIface *iface); -static void comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface); +/** + * @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}, + + /* 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 GSList* get_supported_image_extensions (void); static void get_page_size_area_prepared_cb (GdkPixbufLoader *loader, @@ -67,51 +133,67 @@ static char** extract_argv (EvDocument *document, gint page); -EV_BACKEND_REGISTER_WITH_CODE (ComicsDocument, comics_document, - { - EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS, - comics_document_document_thumbnails_iface_init); - } ); +EV_BACKEND_REGISTER (ComicsDocument, comics_document) -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, - const gchar *command, - GError **error) +comics_decompress_temp_dir (const gchar *command_decompress_tmp, + const gchar *command, + GError **error) { gboolean success; gchar *std_out, *basename; @@ -119,15 +201,17 @@ comics_decompress_temp_dir (const gchar *command_decompress_tmp, gint retval; success = g_spawn_command_line_sync (command_decompress_tmp, &std_out, - NULL, &retval, &err); + NULL, &retval, &err); basename = g_path_get_basename (command); if (!success) { g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("Error launching the command %s for decompressing " - "the comic book to the temporary directory: %s"), basename, err->message); - g_error_free (err); + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("Error launching the command “%s” in order to " + "decompress the comic book: %s"), + basename, + err->message); + g_error_free (err); } else if (WIFEXITED (retval)) { if (WEXITSTATUS (retval) == EXIT_SUCCESS) { g_free (std_out); @@ -135,17 +219,19 @@ comics_decompress_temp_dir (const gchar *command_decompress_tmp, return TRUE; } else { g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("The command %s failed to decompress the " - "comic book to the temporary directory."), basename); + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("The command “%s” failed at " + "decompressing the comic book."), + basename); g_free (std_out); } } else { g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("The command %s does not end normally."), basename); + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("The command “%s” did not end normally."), + basename); g_free (std_out); } g_free (basename); @@ -157,123 +243,66 @@ comics_decompress_temp_dir (const gchar *command_decompress_tmp, * this information */ static gboolean comics_generate_command_lines (ComicsDocument *comics_document, - GError **error) + GError **error) { - gchar *quoted_file; - gchar *command_decompress_tmp, *checksum; - - quoted_file = g_shell_quote (comics_document->archive); + gchar *quoted_file, *quoted_file_aux; + gchar *quoted_command; + ComicBookDecompressType type; - /* RARLabs software */ - if (g_str_has_suffix (comics_document->selected_command, "unrar") && - !comics_document->flag_FLOSS) { - comics_document->extract_command = - g_strdup_printf ("%s p -c- -ierr", - comics_document->selected_command); + type = comics_document->command_usage; + 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 ("%s vb -c- -- %s", - comics_document->selected_command, quoted_file); - comics_document->flag_temp = FALSE; - comics_document->regex_arg = FALSE; - g_free (quoted_file); - return TRUE; + 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); } - - /* Gna! unrar */ - if (g_str_has_suffix (comics_document->selected_command, "unrar-free") - || (g_str_has_suffix (comics_document->selected_command, - "unrar") && comics_document->flag_FLOSS)) { - - comics_document->flag_temp = TRUE; - - checksum = g_compute_checksum_for_string (G_CHECKSUM_MD5, - comics_document->archive, -1); - comics_document->dir = g_build_filename (ev_tmp_dir (), - checksum, NULL); - g_free (checksum); - /* unrar-free can't create directories so we do it on its - * behalf */ - if (g_mkdir_with_parents (comics_document->dir, 0700) != 0) { - g_set_error (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("Failed to create a directory %s in the " - "temporary directory: %s"), - comics_document->dir, - g_strerror (errno)); - g_free (quoted_file); - return FALSE; - } - - command_decompress_tmp = g_strdup_printf ( "%s -xf %s %s", - comics_document->selected_command, - quoted_file, - comics_document->dir); - - if (!comics_decompress_temp_dir (command_decompress_tmp, - comics_document->selected_command, - error)){ - g_free (command_decompress_tmp); - g_free (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_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, + quoted_command, quoted_file, + comics_document->dir); + g_free (quoted_file); + g_free (quoted_command); + + if (!comics_decompress_temp_dir (comics_document->decompress_tmp, + comics_document->selected_command, error)) return FALSE; - } else { - comics_document->list_command = - g_strdup_printf ("%s t %s", - comics_document->selected_command, - quoted_file); - comics_document->regex_arg = TRUE; - g_free (command_decompress_tmp); - g_free (quoted_file); + else return TRUE; - } - } - - /* InfoZIP's unzip */ - if (g_str_has_suffix (comics_document->selected_command,"unzip")) { - comics_document->extract_command = - g_strdup_printf ("%s -p -C", - comics_document->selected_command); - comics_document->list_command = - g_strdup_printf ("%s -Z -1 -- %s", - comics_document->selected_command, - quoted_file); - comics_document->flag_temp = FALSE; - comics_document->regex_arg = TRUE; - g_free (quoted_file); - return TRUE; - } - - /* p7zip */ - if (g_str_has_suffix (comics_document->selected_command,"7zr")) { - comics_document->extract_command = - g_strdup_printf ("%s x -so", - comics_document->selected_command); - comics_document->list_command = - g_strdup_printf ("%s l -- %s", - comics_document->selected_command, - quoted_file); - comics_document->flag_temp = FALSE; - comics_document->regex_arg = TRUE; + } else { g_free (quoted_file); + g_free (quoted_command); return TRUE; - } - /* You are not supposed to get here ! */ - g_set_error_literal (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("Internal error configuring the command for decompressing " - "the comic book file")); - g_free (quoted_file); - return FALSE; + } /* This function chooses an external command for decompressing a comic * book based on its mime tipe. */ static gboolean comics_check_decompress_command (gchar *mime_type, - ComicsDocument *comics_document, - GError **error) + ComicsDocument *comics_document, + GError **error) { gboolean success; gchar *std_out, *std_err; @@ -296,27 +325,30 @@ comics_check_decompress_command (gchar *mime_type, * option as unrar-free. * */ comics_document->selected_command = - g_find_program_in_path ("unrar"); + g_find_program_in_path ("unrar"); if (comics_document->selected_command) { /* We only use std_err to avoid printing useless error * messages on the terminal */ - success = g_spawn_command_line_sync ( - comics_document->selected_command, - &std_out, &std_err, &retval, &err); + success = + g_spawn_command_line_sync ( + comics_document->selected_command, + &std_out, &std_err, + &retval, &err); if (!success) { g_propagate_error (error, err); g_error_free (err); - return FALSE; + return FALSE; /* I don't check retval status because RARLAB unrar * doesn't have a way to return 0 without involving an * operation with a file*/ } else if (WIFEXITED (retval)) { if (g_strrstr (std_out,"freeware") != NULL) /* The RARLAB freeware client */ - comics_document->flag_FLOSS = FALSE; + comics_document->command_usage = RARLABS; else /* The Gna! free software client */ - comics_document->flag_FLOSS = TRUE; + comics_document->command_usage = GNAUNRAR; + g_free (std_out); g_free (std_err); return TRUE; @@ -325,23 +357,55 @@ comics_check_decompress_command (gchar *mime_type, /* The Gna! free software client with Debian naming convention */ comics_document->selected_command = g_find_program_in_path ("unrar-free"); - if (comics_document->selected_command) + if (comics_document->selected_command) { + comics_document->command_usage = GNAUNRAR; return TRUE; + } + } else if (!strcmp (mime_type, "application/x-cbz") || !strcmp (mime_type, "application/zip")) { /* 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; + } + } else if (!strcmp (mime_type, "application/x-cb7") || - !strcmp (mime_type, "application/x-7z-compressed")) { - /* 7zr is a light stand-alone executable that supports only - * 7z/LZMA/BCJ */ - comics_document->selected_command = + !strcmp (mime_type, "application/x-7z-compressed")) { + /* 7zr, 7za and 7z are the commands from the p7zip project able + * to decompress .7z files */ + comics_document->selected_command = g_find_program_in_path ("7zr"); - if (comics_document->selected_command) + if (comics_document->selected_command) { + comics_document->command_usage = P7ZIP; + return TRUE; + } + comics_document->selected_command = + g_find_program_in_path ("7za"); + if (comics_document->selected_command) { + comics_document->command_usage = P7ZIP; + return TRUE; + } + comics_document->selected_command = + g_find_program_in_path ("7z"); + if (comics_document->selected_command) { + 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, @@ -353,11 +417,18 @@ comics_check_decompress_command (gchar *mime_type, g_set_error_literal (error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_INVALID, - _("Can't find an appropiate command to " - "decompress this type of comic book")); + _("Can't find an appropriate command to " + "decompress this type of comic book")); 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, @@ -367,7 +438,7 @@ comics_document_load (EvDocument *document, GSList *supported_extensions; gchar *std_out; gchar *mime_type; - gchar **cbr_files; + gchar **cb_files, *cb_file; gboolean success; int i, retval; GError *err = NULL; @@ -382,9 +453,9 @@ comics_document_load (EvDocument *document, g_propagate_error (error, err); } else { g_set_error_literal (error, - EV_DOCUMENT_ERROR, - EV_DOCUMENT_ERROR_INVALID, - _("Unknown MIME Type")); + EV_DOCUMENT_ERROR, + EV_DOCUMENT_ERROR_INVALID, + _("Unknown MIME Type")); } return FALSE; @@ -416,10 +487,11 @@ comics_document_load (EvDocument *document, } /* FIXME: is this safe against filenames containing \n in the archive ? */ - cbr_files = g_strsplit (std_out, "\n", 0); + cb_files = g_strsplit (std_out, EV_EOL, 0); + g_free (std_out); - if (!cbr_files) { + if (!cb_files) { g_set_error_literal (error, EV_DOCUMENT_ERROR, EV_DOCUMENT_ERROR_INVALID, @@ -427,31 +499,38 @@ 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; cbr_files[i] != NULL; i++) { - gchar *suffix = g_strrstr (cbr_files[i], "."); + for (i = 0; cb_files[i] != NULL; i++) { + if (comics_document->offset != NO_OFFSET) { + if (g_utf8_strlen (cb_files[i],-1) > + comics_document->offset) { + cb_file = + g_utf8_offset_to_pointer (cb_files[i], + comics_document->offset); + } else { + continue; + } + } else { + cb_file = cb_files[i]; + } + gchar *suffix = g_strrstr (cb_file, "."); if (!suffix) continue; 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 (cbr_files[i])), - (GCompareFunc) strcmp); - comics_document->n_pages++; + g_ptr_array_add (comics_document->page_names, + g_strstrip (g_strdup (cb_file))); } - g_free (suffix); } - - g_strfreev (cbr_files); + g_strfreev (cb_files); 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, @@ -460,6 +539,9 @@ comics_document_load (EvDocument *document, return FALSE; } + /* Now sort the pages */ + g_ptr_array_sort (comics_document->page_names, sort_page_names); + return TRUE; } @@ -477,7 +559,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 @@ -491,14 +578,13 @@ 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; ComicsDocument *comics_document = COMICS_DOCUMENT (document); - if (!comics_document->flag_temp) { - + if (!comics_document->decompress_tmp) { argv = extract_argv (document, page->index); success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH | @@ -537,11 +623,9 @@ 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), - NULL); + 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); if (width) @@ -569,13 +653,13 @@ 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; ComicsDocument *comics_document = COMICS_DOCUMENT (document); - if (!comics_document->flag_temp) { + if (!comics_document->decompress_tmp) { argv = extract_argv (document, rc->page->index); success = g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH | @@ -610,22 +694,19 @@ comics_document_render_pixbuf (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, - rc->page->index ), - NULL); + filename = + g_build_filename (comics_document->dir, + (char *) comics_document->page_names->pdata[rc->page->index], + NULL); - gdk_pixbuf_get_file_info (filename, &width, &height); + gdk_pixbuf_get_file_info (filename, &width, &height); - rotated_pixbuf = gdk_pixbuf_rotate_simple ( - gdk_pixbuf_new_from_file_at_size ( - filename, - width * (rc->scale) + 0.5, - height * (rc->scale) + 0.5, - NULL), - 360 - rc->rotation); - g_free (filename); + rotated_pixbuf = + gdk_pixbuf_rotate_simple (gdk_pixbuf_new_from_file_at_size ( + filename, width * (rc->scale) + 0.5, + height * (rc->scale) + 0.5, NULL), + 360 - rc->rotation); + g_free (filename); } return rotated_pixbuf; @@ -675,8 +756,9 @@ comics_remove_dir (gchar *path_name) content_dir = g_dir_open (path_name, 0, NULL); filename = g_dir_read_name (content_dir); while (filename) { - filename_with_path = g_build_filename (path_name, - filename, NULL); + filename_with_path = + g_build_filename (path_name, + filename, NULL); comics_remove_dir (filename_with_path); g_free (filename_with_path); filename = g_dir_read_name (content_dir); @@ -693,31 +775,24 @@ static void comics_document_finalize (GObject *object) { ComicsDocument *comics_document = COMICS_DOCUMENT (object); - - if (comics_document->flag_temp) { + + if (comics_document->decompress_tmp) { if (comics_remove_dir (comics_document->dir) == -1) - g_warning (_("There was an error deleting %s"), - comics_document->dir); + g_warning (_("There was an error deleting “%s”."), + comics_document->dir); g_free (comics_document->dir); } - if (comics_document->archive) - g_free (comics_document->archive); - 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); } - if (comics_document->selected_command) - g_free (comics_document->selected_command); - - if (comics_document->extract_command) - g_free (comics_document->extract_command); - - if (comics_document->list_command) - g_free (comics_document->list_command); + 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); } @@ -725,27 +800,16 @@ comics_document_finalize (GObject *object) static void comics_document_class_init (ComicsDocumentClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = comics_document_finalize; -} + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + EvDocumentClass *ev_document_class = EV_DOCUMENT_CLASS (klass); -static EvDocumentInfo * -comics_document_get_info (EvDocument *document) -{ - EvDocumentInfo *info; - info = g_new0 (EvDocumentInfo, 1); - return info; -} + gobject_class->finalize = comics_document_finalize; -static void -comics_document_document_iface_init (EvDocumentIface *iface) -{ - iface->load = comics_document_load; - iface->save = comics_document_save; - iface->get_n_pages = comics_document_get_n_pages; - iface->get_page_size = comics_document_get_page_size; - iface->render = comics_document_render; - iface->get_info = comics_document_get_info; + ev_document_class->load = comics_document_load; + ev_document_class->save = comics_document_save; + 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; } static void @@ -754,7 +818,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 */ @@ -781,52 +844,6 @@ get_supported_image_extensions() return extensions; } -static GdkPixbuf * -comics_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document, - EvRenderContext *rc, - gboolean border) -{ - GdkPixbuf *thumbnail; - - thumbnail = comics_document_render_pixbuf (EV_DOCUMENT (document), rc); - - if (border) { - GdkPixbuf *tmp_pixbuf = thumbnail; - - thumbnail = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf); - g_object_unref (tmp_pixbuf); - } - - return thumbnail; -} - -static void -comics_document_thumbnails_get_dimensions (EvDocumentThumbnails *document, - EvRenderContext *rc, - gint *width, - gint *height) -{ - gdouble page_width, page_height; - - comics_document_get_page_size (EV_DOCUMENT (document), rc->page, - &page_width, &page_height); - - if (rc->rotation == 90 || rc->rotation == 270) { - *width = (gint) (page_height * rc->scale); - *height = (gint) (page_width * rc->scale); - } else { - *width = (gint) (page_width * rc->scale); - *height = (gint) (page_height * rc->scale); - } -} - -static void -comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface) -{ - iface->get_thumbnail = comics_document_thumbnails_get_thumbnail; - iface->get_dimensions = comics_document_thumbnails_get_dimensions; -} - static char** extract_argv (EvDocument *document, gint page) { @@ -835,28 +852,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);