/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
/*
+ * Copyright (C) 2009, Juanjo Marín <juanj.marin@juntadeandalucia.es>
* Copyright (C) 2005, Teemu Tervo <teemu.tervo@gmx.net>
*
* This program is free software; you can redistribute it and/or modify
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "config.h"
-
#include <config.h>
+
#include <unistd.h>
#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include <glib.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
-#include <sys/wait.h>
-#include <stdlib.h>
-#include <errno.h>
+
+#ifdef G_OS_WIN32
+# define WIFEXITED(x) ((x) != 3)
+# define WEXITSTATUS(x) (x)
+#else
+# include <sys/wait.h>
+#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;
gchar *archive, *dir;
- GSList *page_names;
- gint n_pages;
+ GPtrArray *page_names;
gchar *selected_command;
gchar *extract_command, *list_command, *decompress_tmp;
- gboolean regex_arg;
gint offset;
ComicBookDecompressType command_usage;
};
/* 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},
+
+ /* GNA! unrar */
+ {NULL , "%s t %s" , "%s -xf %s %s" , NO_OFFSET},
+ /* unzip */
+ {"%s -p -C --" , "%s -Z -1 -- %s" , NULL , NO_OFFSET},
-typedef struct _ComicsDocumentClass ComicsDocumentClass;
+ /* 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);
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
GError **error)
{
gchar *quoted_file;
+ 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);
+ quoted_command = g_shell_quote (comics_document->selected_command);
+
+ comics_document->extract_command =
+ g_strdup_printf (command_usage_def[type].extract,
+ quoted_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;
+ g_strdup_printf (command_usage_def[type].list,
+ quoted_command, quoted_file);
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;
}
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,
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,
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) {
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);
}
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,
uri);
return FALSE;
}
+
+ /* Now sort the pages */
+ g_ptr_array_sort (comics_document->page_names, sort_page_names);
+
return TRUE;
}
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
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);
} 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);
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_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)
{
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
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 */
char *command_line, *quoted_archive, *quoted_filename;
GError *err = NULL;
+ if (page >= comics_document->page_names->len)
+ return NULL;
+
quoted_archive = g_shell_quote (comics_document->archive);
- if (comics_document->regex_arg) {
- quoted_filename = comics_regex_quote (
- g_slist_nth_data (comics_document->page_names, page));
- } else {
- quoted_filename = g_shell_quote (
- g_slist_nth_data (comics_document->page_names, 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) {
g_warning (_("Error %s"), err->message);
g_error_free (err);
return NULL;
}
-
+
g_free (command_line);
g_free (quoted_archive);
g_free (quoted_filename);
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff