gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-24 18:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support adding files to archives via file-roller. Thanks to Nelson

Browse source 
2008-05-29  Christian Neumair  <cneumair@gnome.org>

	* libnautilus-private/nautilus-dnd.c
	(nautilus_drag_default_drop_action_for_icons):
	* libnautilus-private/nautilus-file-dnd.c
	(nautilus_drag_can_accept_files):
	* libnautilus-private/nautilus-file-utilities.c
	(nautilus_is_file_roller_installed):
	* libnautilus-private/nautilus-file-utilities.h:
	* libnautilus-private/nautilus-file.c (nautilus_file_is_archive):
	* libnautilus-private/nautilus-file.h:
	* src/file-manager/fm-directory-view.c
	(fm_directory_view_move_copy_items):
	Support adding files to archives via file-roller.
	Thanks to Nelson Benítez. Fixes #377157.

svn path=/trunk/; revision=14208
This commit is contained in:
Christian Neumair 2008-05-29 18:30:47 +00:00 committed by Christian Neumair
parent 520fdece0b
commit aea8624766
8 changed files with 129 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2008-05-29 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-dnd.c
(nautilus_drag_default_drop_action_for_icons):
* libnautilus-private/nautilus-file-dnd.c
(nautilus_drag_can_accept_files):
* libnautilus-private/nautilus-file-utilities.c
(nautilus_is_file_roller_installed):
* libnautilus-private/nautilus-file-utilities.h:
* libnautilus-private/nautilus-file.c (nautilus_file_is_archive):
* libnautilus-private/nautilus-file.h:
* src/file-manager/fm-directory-view.c
(fm_directory_view_move_copy_items):
Support adding files to archives via file-roller.
Thanks to Nelson Benítez. Fixes #377157.
2008-05-28 Christian Neumair <cneumair@gnome.org>
* src/file-manager/fm-ditem-page.c (build_table), (create_page),

18
libnautilus-private/nautilus-dnd.c
View file

@ -368,7 +368,7 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
const char *dropped_uri;
GFile *target, *dropped;
GdkDragAction actions;
NautilusFile *target_file;
NautilusFile *dropped_file, *target_file;
if (target_uri_string == NULL) {
*action = 0;
@ -389,7 +389,8 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
}
dropped_uri = ((NautilusDragSelectionItem *)items->data)->uri;
target_file = nautilus_file_get_existing_by_uri (dropped_uri);
dropped_file = nautilus_file_get_existing_by_uri (dropped_uri);
target_file = nautilus_file_get_existing_by_uri (target_uri_string);
/*
* Check for trash URI. We do a find_directory for any Trash directory.
@ -402,13 +403,15 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
*action = GDK_ACTION_MOVE;
}
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
return;
} else if (target_file != NULL && nautilus_file_is_launcher (target_file)) {
} else if (dropped_file != NULL && nautilus_file_is_launcher (dropped_file)) {
if (actions & GDK_ACTION_MOVE) {
*action = GDK_ACTION_MOVE;
}
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
return;
} else if (eel_uri_is_desktop (target_uri_string)) {
@ -419,13 +422,22 @@ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
*action = GDK_ACTION_MOVE;
}
g_free (target);
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
return;
}
} else if (target_file != NULL && nautilus_file_is_archive (target_file)) {
*action = GDK_ACTION_COPY;
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
return;
} else {
target = g_file_new_for_uri (target_uri_string);
}
nautilus_file_unref (dropped_file);
nautilus_file_unref (target_file);
/* Compare the first dropped uri with the target uri for same fs match. */

6
libnautilus-private/nautilus-file-dnd.c
View file

@ -29,6 +29,7 @@
#include "nautilus-dnd.h"
#include "nautilus-directory.h"
#include "nautilus-file-utilities.h"
#include <eel/eel-glib-extensions.h>
#include <string.h>
@ -60,6 +61,11 @@ nautilus_drag_can_accept_files (NautilusFile *drop_target_item)
if (nautilus_file_is_nautilus_link (drop_target_item)) {
return TRUE;
}
if (nautilus_is_file_roller_installed () &&
nautilus_file_is_archive (drop_target_item)) {
return TRUE;
}
return FALSE;
}

16
libnautilus-private/nautilus-file-utilities.c
View file

@ -959,6 +959,22 @@ nautilus_find_file_insensitive_next (GFile *parent, const gchar *name)
return NULL;
}
gboolean
nautilus_is_file_roller_installed (void)
{
static int installed = - 1;
if (installed < 0) {
if (g_find_program_in_path ("file-roller")) {
installed = 1;
} else {
installed = 0;
}
}
return installed > 0 ? TRUE : FALSE;
}
#if !defined (NAUTILUS_OMIT_SELF_CHECK)
void

2
libnautilus-private/nautilus-file-utilities.h
View file

@ -79,6 +79,8 @@ char * nautilus_pixmap_file (const char *partial_path);
/* Locate a file in either the uers directory or the datadir. */
char * nautilus_get_data_file_path (const char *partial_path);
gboolean nautilus_is_file_roller_installed (void);
/* Return an allocated file name that is guranteed to be unique, but
* tries to make the name readable to users.
* This isn't race-free, so don't use for security-related things

39
libnautilus-private/nautilus-file.c
View file

@ -5936,6 +5936,45 @@ nautilus_file_is_directory (NautilusFile *file)
return nautilus_file_get_file_type (file) == G_FILE_TYPE_DIRECTORY;
}
gboolean
nautilus_file_is_archive (NautilusFile *file)
{
char *mime_type;
int i;
static const char * archive_mime_types[] = { "application/x-gtar",
"application/x-zip",
"application/x-zip-compressed",
"application/zip",
"application/x-zip",
"application/x-tar",
"application/x-7z-compressed",
"application/x-rar",
"application/x-rar-compressed",
"application/x-jar",
"application/x-java-archive",
"application/x-war",
"application/x-ear",
"application/x-arj" };
/* TODO the following MIME types are ignored until file-roller supports to add
* files to them via command line:
* application/x-gzip, application/x-bzip-compressed-tar, application/x-compressed-tar
*/
g_return_val_if_fail (file != NULL, FALSE);
mime_type = nautilus_file_get_mime_type (file);
for (i = 0; i < G_N_ELEMENTS (archive_mime_types); i++) {
if (!strcmp (mime_type, archive_mime_types[i])) {
g_free (mime_type);
return TRUE;
}
}
g_free (mime_type);
return FALSE;
}
/**
* nautilus_file_is_in_trash
*

1
libnautilus-private/nautilus-file.h
View file

@ -181,6 +181,7 @@ gboolean nautilus_file_is_broken_symbolic_link (Nautilu
gboolean nautilus_file_is_nautilus_link (NautilusFile *file);
gboolean nautilus_file_is_executable (NautilusFile *file);
gboolean nautilus_file_is_directory (NautilusFile *file);
gboolean nautilus_file_is_archive (NautilusFile *file);
gboolean nautilus_file_is_in_trash (NautilusFile *file);
gboolean nautilus_file_is_in_desktop (NautilusFile *file);
gboolean nautilus_file_is_home (NautilusFile *file);

34
src/file-manager/fm-directory-view.c
View file

@ -8569,6 +8569,40 @@ fm_directory_view_move_copy_items (const GList *item_uris,
target_uri, item_uris,
fm_directory_view_get_containing_window (view));
return;
} else if (copy_action == GDK_ACTION_COPY &&
nautilus_is_file_roller_installed () &&
target_file != NULL &&
nautilus_file_is_archive (target_file)) {
char *command, *quoted_uri, *tmp;
const GList *l;
GdkScreen *screen;
/* Handle dropping onto a file-roller archiver file, instead of starting a move/copy */
nautilus_file_unref (target_file);
quoted_uri = g_shell_quote (target_uri);
command = g_strconcat ("file-roller -a ", quoted_uri, NULL);
g_free (quoted_uri);
for (l = item_uris; l != NULL; l = l->next) {
quoted_uri = g_shell_quote ((char *) l->data);
tmp = g_strconcat (command, " ", quoted_uri, NULL);
g_free (command);
command = tmp;
g_free (quoted_uri);
}
screen = gtk_widget_get_screen (GTK_WIDGET (view));
if (screen == NULL) {
screen = gdk_screen_get_default ();
}
gdk_spawn_command_line_on_screen (screen, command, NULL);
g_free (command);
return;
}
nautilus_file_unref (target_file);