summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am2
-rw-r--r--src/fr-command-7z.c2
-rw-r--r--src/fr-command-rar.c111
-rw-r--r--src/rar-utils.c139
-rw-r--r--src/rar-utils.h30
5 files changed, 174 insertions, 110 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 321a0d8..cba14ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,6 +145,8 @@ engrampa_SOURCES = \
open-file.h \
preferences.c \
preferences.h \
+ rar-utils.c \
+ rar-utils.h \
typedefs.h \
ui.h \
$(MKDTEMP_FILES) \
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index 27eb703..dde039e 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -235,6 +235,8 @@ list__begin (gpointer data)
static void
fr_command_7z_list (FrCommand *comm)
{
+ rar_check_multi_vomule (comm);
+
fr_process_set_out_line_func (comm->process, list__process_line, comm);
fr_command_7z_begin_command (comm);
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index e9b45dd..4daa9fa 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -312,115 +312,6 @@ add_password_arg (FrCommand *comm,
}
-typedef enum {
- FIRST_VOLUME_IS_000,
- FIRST_VOLUME_IS_001,
- FIRST_VOLUME_IS_RAR
-} FirstVolumeExtension;
-
-
-static char *
-get_first_volume_name (const char *name,
- const char *pattern,
- FirstVolumeExtension extension_type)
-{
- char *volume_name = NULL;
- GRegex *re;
-
- re = g_regex_new (pattern, G_REGEX_CASELESS, 0, NULL);
- if (g_regex_match (re, name, 0, NULL)) {
- char **parts;
- int l, i;
-
- parts = g_regex_split (re, name, 0);
- l = strlen (parts[2]);
- switch (extension_type) {
- case FIRST_VOLUME_IS_000:
- for (i = 0; i < l; i++)
- parts[2][i] = '0';
- break;
-
- case FIRST_VOLUME_IS_001:
- for (i = 0; i < l; i++)
- parts[2][i] = (i < l - 1) ? '0' : '1';
- break;
-
- case FIRST_VOLUME_IS_RAR:
- if (g_str_has_suffix (parts[1], "r")) {
- parts[2][0] = 'a';
- parts[2][1] = 'r';
- }
- else {
- parts[2][0] = 'A';
- parts[2][1] = 'R';
- }
- break;
- }
-
- volume_name = g_strjoinv ("", parts);
-
- g_strfreev (parts);
- }
- g_regex_unref (re);
-
- if (volume_name != NULL) {
- char *tmp;
-
- tmp = volume_name;
- volume_name = g_filename_from_utf8 (tmp, -1, NULL, NULL, NULL);
- g_free (tmp);
- }
-
- return volume_name;
-}
-
-
-static void
-check_multi_vomule (FrCommand *comm)
-{
- GFile *file;
- char buffer[11];
-
- file = g_file_new_for_path (comm->filename);
- if (! g_load_file_in_buffer (file, buffer, 11, NULL)) {
- g_object_unref (file);
- return;
- }
-
- if ((buffer[10] & 0x01) == 0x01) {
- char *volume_name = NULL;
- char *name;
-
- name = g_filename_to_utf8 (file_name_from_path (comm->filename), -1, NULL, NULL, NULL);
-
- volume_name = get_first_volume_name (name, "^(.*\\.part)([0-9]+)(\\.rar)$", FIRST_VOLUME_IS_001);
- if (volume_name == NULL)
- volume_name = get_first_volume_name (name, "^(.*\\.r)([0-9]+)$", FIRST_VOLUME_IS_RAR);
- if (volume_name == NULL)
- volume_name = get_first_volume_name (name, "^(.*\\.)([0-9]+)$", FIRST_VOLUME_IS_001);
-
- if (volume_name != NULL) {
- GFile *parent;
- GFile *child;
- char *volume_filename;
-
- parent = g_file_get_parent (file);
- child = g_file_get_child (parent, volume_name);
- volume_filename = g_file_get_path (child);
- fr_command_set_multi_volume (comm, volume_filename);
-
- g_free (volume_filename);
- g_object_unref (child);
- g_object_unref (parent);
- }
-
- g_free (name);
- }
-
- g_object_unref (file);
-}
-
-
static void
list__begin (gpointer data)
{
@@ -433,7 +324,7 @@ list__begin (gpointer data)
static void
fr_command_rar_list (FrCommand *comm)
{
- check_multi_vomule (comm);
+ rar_check_multi_vomule (comm);
fr_process_set_out_line_func (comm->process, process_line, comm);
diff --git a/src/rar-utils.c b/src/rar-utils.c
new file mode 100644
index 0000000..0cb34e2
--- /dev/null
+++ b/src/rar-utils.c
@@ -0,0 +1,139 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * File-Roller
+ *
+ * Copyright (C) 2011 The Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <config.h>
+#include <string.h>
+#include "file-utils.h"
+#include "fr-command.h"
+#include "gio-utils.h"
+
+
+typedef enum {
+ FIRST_VOLUME_IS_000,
+ FIRST_VOLUME_IS_001,
+ FIRST_VOLUME_IS_RAR
+} FirstVolumeExtension;
+
+
+static char *
+get_first_volume_name (const char *name,
+ const char *pattern,
+ FirstVolumeExtension extension_type)
+{
+ char *volume_name = NULL;
+ GRegex *re;
+
+ re = g_regex_new (pattern, G_REGEX_CASELESS, 0, NULL);
+ if (g_regex_match (re, name, 0, NULL)) {
+ char **parts;
+ int l, i;
+
+ parts = g_regex_split (re, name, 0);
+ l = strlen (parts[2]);
+ switch (extension_type) {
+ case FIRST_VOLUME_IS_000:
+ for (i = 0; i < l; i++)
+ parts[2][i] = '0';
+ break;
+
+ case FIRST_VOLUME_IS_001:
+ for (i = 0; i < l; i++)
+ parts[2][i] = (i < l - 1) ? '0' : '1';
+ break;
+
+ case FIRST_VOLUME_IS_RAR:
+ if (g_str_has_suffix (parts[1], "r")) {
+ parts[2][0] = 'a';
+ parts[2][1] = 'r';
+ }
+ else {
+ parts[2][0] = 'A';
+ parts[2][1] = 'R';
+ }
+ break;
+ }
+
+ volume_name = g_strjoinv ("", parts);
+
+ g_strfreev (parts);
+ }
+ g_regex_unref (re);
+
+ if (volume_name != NULL) {
+ char *tmp;
+
+ tmp = volume_name;
+ volume_name = g_filename_from_utf8 (tmp, -1, NULL, NULL, NULL);
+ g_free (tmp);
+ }
+
+ return volume_name;
+}
+
+
+void
+rar_check_multi_vomule (FrCommand *comm)
+{
+ GFile *file;
+ char buffer[11];
+
+ file = g_file_new_for_path (comm->filename);
+ if (! g_load_file_in_buffer (file, buffer, 11, NULL)) {
+ g_object_unref (file);
+ return;
+ }
+
+ if (memcmp (buffer, "Rar!", 4) != 0)
+ return;
+
+ if ((buffer[10] & 0x01) == 0x01) {
+ char *volume_name = NULL;
+ char *name;
+
+ name = g_filename_to_utf8 (file_name_from_path (comm->filename), -1, NULL, NULL, NULL);
+
+ volume_name = get_first_volume_name (name, "^(.*\\.part)([0-9]+)(\\.rar)$", FIRST_VOLUME_IS_001);
+ if (volume_name == NULL)
+ volume_name = get_first_volume_name (name, "^(.*\\.r)([0-9]+)$", FIRST_VOLUME_IS_RAR);
+ if (volume_name == NULL)
+ volume_name = get_first_volume_name (name, "^(.*\\.)([0-9]+)$", FIRST_VOLUME_IS_001);
+
+ if (volume_name != NULL) {
+ GFile *parent;
+ GFile *child;
+ char *volume_filename;
+
+ parent = g_file_get_parent (file);
+ child = g_file_get_child (parent, volume_name);
+ volume_filename = g_file_get_path (child);
+ fr_command_set_multi_volume (comm, volume_filename);
+
+ g_free (volume_filename);
+ g_object_unref (child);
+ g_object_unref (parent);
+ }
+
+ g_free (name);
+ }
+
+ g_object_unref (file);
+}
diff --git a/src/rar-utils.h b/src/rar-utils.h
new file mode 100644
index 0000000..01ba9bb
--- /dev/null
+++ b/src/rar-utils.h
@@ -0,0 +1,30 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/*
+ * File-Roller
+ *
+ * Copyright (C) 2011 Free Software Foundation, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RAR_UTILS_H
+#define RAR_UTILS_H
+
+
+#include "fr-command.h"
+
+void rar_check_multi_vomule (FrCommand *comm);
+
+#endif /* RAR_UTILS_H */
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-01 14:13:48 +0000