Add libdocument/ev-file-helpers.c to POTFILES.in

[evince.git] / backend / comics / comics-document.c

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index fbe6ba01c99c047ba52a70958fe02b976868d8e2..c871860dd4a6e704121a11844ebcca521404c65c 100644 (file)
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -17,28 +17,24 @@
  * 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 <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
-#include <gio/gio.h>
 #include <sys/wait.h>
 #include <stdlib.h>
 #include <errno.h>
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+#include <gio/gio.h>
+
 #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,
@@ -47,6 +43,13 @@ typedef enum
        P7ZIP
 } ComicBookDecompressType;
 
+typedef struct _ComicsDocumentClass ComicsDocumentClass;
+
+struct _ComicsDocumentClass
+{
+       EvDocumentClass parent_class;
+};
+
 struct _ComicsDocument
 {
        EvDocument parent_instance;
@@ -66,20 +69,40 @@ 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[] = {
+/**
+ * @extract: command line arguments to pass to extract a file from the archive
+ *   to stdout. The archive file and the file to extract will be appended after
+ *   a "--".
+ * @list: command line arguments to list the archive contents
+ * @decompress_tmp: command line arguments to pass to extract the archive
+ *   into a directory. The archive file and the directory to extract to will be
+ *   appended after a "--".
+ * @regex_arg: whether the command expects one filename or accepts a regex (glob?)
+ * @offset: the byte 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"   , TRUE , NO_OFFSET},
+
+        /* unzip */
        {"%s -p -C"      , "%s -Z -1 -- %s" , NULL             , TRUE , NO_OFFSET},
+
+        /* 7zip */
        {NULL            , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z}
 };
 
-
-typedef struct    _ComicsDocumentClass ComicsDocumentClass;
-
 static void       comics_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 
 static GSList*    get_supported_image_extensions (void);
@@ -205,32 +228,20 @@ comics_generate_command_lines (ComicsDocument *comics_document,
        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
@@ -713,7 +724,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) {