New efm_op stuff from ptomaine. Test it out, try many different cases of copying/moving/removing etc. Right now progress for operations is just printed on STDOUT, but this will hopefully change soon (Something I've started already). If you find any bugs, send them to the list and/or notify ptomaine and/or myself. If someone wants to be a formatting nazi go ahead and check the formatting, I gave it a quick scan and it seemed close. More to come :)
SVN revision: 35178
This commit is contained in:
Nicholas Hughart
parent
1064be7774
commit
634f26b04f
|
|
@ -21,7 +21,8 @@ enlightenment_start \
|
|||
enlightenment_thumb \
|
||||
enlightenment_sys \
|
||||
enlightenment_fm \
|
||||
enlightenment_init
|
||||
enlightenment_init \
|
||||
enlightenment_fm_op
|
||||
|
||||
ENLIGHTENMENTHEADERS = \
|
||||
e.h \
|
||||
|
|
@ -131,6 +132,7 @@ e_confirm_dialog.h \
|
|||
e_int_border_prop.h \
|
||||
e_entry_dialog.h \
|
||||
e_fm.h \
|
||||
e_fm_op.h \
|
||||
e_fm_hal.h \
|
||||
e_widget_scrollframe.h \
|
||||
e_sha1.h \
|
||||
|
|
@ -337,11 +339,18 @@ enlightenment_thumb_LDFLAGS = @e_libs@
|
|||
enlightenment_fm_SOURCES = \
|
||||
e_fm_main.c \
|
||||
e_user.c \
|
||||
e_sha1.c
|
||||
e_sha1.c \
|
||||
e_prefix.c
|
||||
|
||||
enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@
|
||||
enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@
|
||||
|
||||
enlightenment_fm_op_SOURCES = \
|
||||
e_fm_op.c
|
||||
|
||||
enlightenment_fm_op_LDFLAGS = @e_libs@
|
||||
enlightenment_fm_op_CFLAGS = $(INCLUDES)
|
||||
|
||||
enlightenment_sys_SOURCES = \
|
||||
e_sys_main.c
|
||||
|
||||
|
|
|
|||
210
src/bin/e_fm.c
210
src/bin/e_fm.c
|
|
@ -3,6 +3,7 @@
|
|||
*/
|
||||
#include "e.h"
|
||||
#include "e_fm_hal.h"
|
||||
#include "e_fm_op.h"
|
||||
|
||||
#define OVERCLIP 128
|
||||
|
||||
|
|
@ -300,6 +301,23 @@ static void _e_fm2_file_rename_yes_cb(char *text, void *data);
|
|||
static void _e_fm2_file_rename_no_cb(void *data);
|
||||
static void _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_fm2_file_properties_delete_cb(void *obj);
|
||||
|
||||
static void _e_fm_overwrite_dialog(int pid, const char *str);
|
||||
static void _e_fm_overwrite_delete_cb(void *obj);
|
||||
static void _e_fm_send_overwrite_response(int id, E_Fm_Op_Type type);
|
||||
static void _e_fm_overwrite_no_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_overwrite_no_all_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_overwrite_yes_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_overwrite_yes_all_cb(void *data, E_Dialog *dialog);
|
||||
|
||||
static void _e_fm_error_dialog(int pid, const char *str);
|
||||
static void _e_fm_error_delete_cb(void *obj);
|
||||
static void _e_fm_send_error_response(int id, E_Fm_Op_Type type);
|
||||
static void _e_fm_error_retry_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_error_abort_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_error_ignore_this_cb(void *data, E_Dialog *dialog);
|
||||
static void _e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog);
|
||||
|
||||
static void _e_fm2_file_delete(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_fm2_file_delete_delete_cb(void *obj);
|
||||
static void _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog);
|
||||
|
|
@ -2233,8 +2251,29 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
|
|||
v->mount_point = NULL;
|
||||
}
|
||||
}
|
||||
case 14:/*error*/
|
||||
printf("%s:%s(%d) Error from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data);
|
||||
_e_fm_error_dialog(e->ref, e->data);
|
||||
break;
|
||||
default:
|
||||
|
||||
case 15:/*overwrite*/
|
||||
printf("%s:%s(%d) Overwrite from slave #%d: %s\n", __FILE__, __FUNCTION__, __LINE__, e->ref, e->data);
|
||||
_e_fm_overwrite_dialog(e->ref, e->data);
|
||||
break;
|
||||
|
||||
case 16:/*progress*/
|
||||
{
|
||||
int percent, seconds;
|
||||
|
||||
if(!e->data || e->size != 2 * sizeof(int)) return;
|
||||
|
||||
percent = *(int *)e->data;
|
||||
seconds = *(int *)(e->data + sizeof(int));
|
||||
printf("%s:%s(%d) Progress from slave #%d: %d%% done, %d seconds left.\n", __FILE__, __FUNCTION__, __LINE__, e->ref, percent, seconds);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -6974,6 +7013,175 @@ _e_fm2_file_rename_no_cb(void *data)
|
|||
ic->entry_dialog = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_dialog(int pid, const char *str)
|
||||
{
|
||||
E_Manager *man;
|
||||
E_Container *con;
|
||||
E_Dialog *dialog;
|
||||
int *id;
|
||||
char text[4096 + PATH_MAX];
|
||||
|
||||
man = e_manager_current_get();
|
||||
if (!man) return;
|
||||
con = e_container_current_get(man);
|
||||
if (!con) return;
|
||||
|
||||
id = malloc(sizeof(int));
|
||||
*id = pid;
|
||||
|
||||
dialog = e_dialog_new(con, "E", "_fm_overwrite_dialog");
|
||||
E_OBJECT(dialog)->data = id;
|
||||
e_object_del_attach_func_set(E_OBJECT(dialog), _e_fm_overwrite_delete_cb);
|
||||
e_dialog_button_add(dialog, _("No"), NULL, _e_fm_overwrite_no_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("No to all"), NULL, _e_fm_overwrite_no_all_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("Yes"), NULL, _e_fm_overwrite_yes_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("Yes to all"), NULL, _e_fm_overwrite_yes_all_cb, NULL);
|
||||
|
||||
e_dialog_button_focus_num(dialog, 0);
|
||||
e_dialog_title_set(dialog, _("Error"));
|
||||
snprintf(text, sizeof(text),
|
||||
_("%s"),
|
||||
str);
|
||||
|
||||
e_dialog_text_set(dialog, text);
|
||||
e_win_centered_set(dialog->win, 1);
|
||||
e_dialog_show(dialog);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_delete_cb(void *obj)
|
||||
{
|
||||
int *id = E_OBJECT(obj)->data;
|
||||
free(id);
|
||||
}
|
||||
|
||||
/* TODO: merge _e_fm_send_overwrite_response() and _e_fm_send_error_response() (???) */
|
||||
|
||||
static void
|
||||
_e_fm_send_overwrite_response(int id, E_Fm_Op_Type type)
|
||||
{
|
||||
ecore_ipc_client_send(_e_fm2_client_get()->cl, E_IPC_DOMAIN_FM, 15,
|
||||
id, 0, 0,
|
||||
&type, sizeof(E_Fm_Op_Type));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_no_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_overwrite_response(*id, E_FM_OP_OVERWRITE_RESPONSE_NO);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_no_all_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_overwrite_response(*id, E_FM_OP_OVERWRITE_RESPONSE_NO_ALL);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_yes_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_overwrite_response(*id, E_FM_OP_OVERWRITE_RESPONSE_YES);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_overwrite_yes_all_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_overwrite_response(*id, E_FM_OP_OVERWRITE_RESPONSE_YES_ALL);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_dialog(int pid, const char *str)
|
||||
{
|
||||
E_Manager *man;
|
||||
E_Container *con;
|
||||
E_Dialog *dialog;
|
||||
int *id;
|
||||
char text[4096 + PATH_MAX];
|
||||
|
||||
man = e_manager_current_get();
|
||||
if (!man) return;
|
||||
con = e_container_current_get(man);
|
||||
if (!con) return;
|
||||
|
||||
id = malloc(sizeof(int));
|
||||
*id = pid;
|
||||
|
||||
dialog = e_dialog_new(con, "E", "_fm_error_dialog");
|
||||
E_OBJECT(dialog)->data = id;
|
||||
e_object_del_attach_func_set(E_OBJECT(dialog), _e_fm_error_delete_cb);
|
||||
e_dialog_button_add(dialog, _("Retry"), NULL, _e_fm_error_retry_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("Abort"), NULL, _e_fm_error_abort_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("Ignore this"), NULL, _e_fm_error_ignore_this_cb, NULL);
|
||||
e_dialog_button_add(dialog, _("Ignore all"), NULL, _e_fm_error_ignore_all_cb, NULL);
|
||||
|
||||
e_dialog_button_focus_num(dialog, 0);
|
||||
e_dialog_title_set(dialog, _("Error"));
|
||||
snprintf(text, sizeof(text),
|
||||
_("An error occured while performing an operation.<br>"
|
||||
"%s"),
|
||||
str);
|
||||
|
||||
e_dialog_text_set(dialog, text);
|
||||
e_win_centered_set(dialog->win, 1);
|
||||
e_dialog_show(dialog);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_delete_cb(void *obj)
|
||||
{
|
||||
int *id = E_OBJECT(obj)->data;
|
||||
free(id);
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_send_error_response(int id, E_Fm_Op_Type type)
|
||||
{
|
||||
ecore_ipc_client_send(_e_fm2_client_get()->cl, E_IPC_DOMAIN_FM, 14,
|
||||
id, 0, 0,
|
||||
&type, sizeof(E_Fm_Op_Type));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_retry_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_error_response(*id, E_FM_OP_ERROR_RESPONSE_RETRY);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_abort_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_error_response(*id, E_FM_OP_ERROR_RESPONSE_ABORT);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_ignore_this_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_error_response(*id, E_FM_OP_ERROR_RESPONSE_IGNORE_THIS);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm_error_ignore_all_cb(void *data, E_Dialog *dialog)
|
||||
{
|
||||
int *id = E_OBJECT(dialog)->data;
|
||||
_e_fm_send_error_response(*id, E_FM_OP_ERROR_RESPONSE_IGNORE_ALL);
|
||||
e_object_del(E_OBJECT(dialog));
|
||||
}
|
||||
|
||||
static void
|
||||
_e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
* vim:cindent:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#ifndef _FILE_OFFSET_BITS
|
||||
#define _FILE_OFFSET_BITS 64
|
||||
|
|
@ -35,6 +35,8 @@
|
|||
#include <Eet.h>
|
||||
#include "config.h"
|
||||
|
||||
#include "e_fm_op.h"
|
||||
|
||||
/* E_DBUS support */
|
||||
#ifdef HAVE_EDBUS
|
||||
#include <E_DBus.h>
|
||||
|
|
@ -57,6 +59,7 @@
|
|||
typedef struct _E_Dir E_Dir;
|
||||
typedef struct _E_Fop E_Fop;
|
||||
typedef struct _E_Mod E_Mod;
|
||||
typedef struct _E_Fm_Slave E_Fm_Slave;
|
||||
|
||||
struct _E_Dir
|
||||
{
|
||||
|
|
@ -100,12 +103,30 @@ struct _E_Mod
|
|||
unsigned char done : 1;
|
||||
};
|
||||
|
||||
struct _E_Fm_Slave
|
||||
{
|
||||
Ecore_Exe *exe;
|
||||
int id;
|
||||
};
|
||||
|
||||
/* local subsystem functions */
|
||||
static int _e_ipc_init(void);
|
||||
static int _e_ipc_cb_server_add(void *data, int type, void *event);
|
||||
static int _e_ipc_cb_server_del(void *data, int type, void *event);
|
||||
static int _e_ipc_cb_server_data(void *data, int type, void *event);
|
||||
|
||||
|
||||
static int _e_client_send_overwrite(int id, const char *data, int size);
|
||||
static int _e_client_send_error(int id, const char *data, int size);
|
||||
static int _e_client_send_progress(int id, const char *data, int size);
|
||||
|
||||
static int _e_fm_slave_run(E_Fm_Op_Type type, const char *src, const char *dst, int id);
|
||||
static E_Fm_Slave *_e_fm_slave_get(int id);
|
||||
static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size);
|
||||
static int _e_fm_slave_data_cb(void *data, int type, void *event);
|
||||
static int _e_fm_slave_error_cb(void *data, int type, void *event);
|
||||
static int _e_fm_slave_del_cb(void *data, int type, void *event);
|
||||
|
||||
static void _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path);
|
||||
static int _e_cb_recent_clean(void *data);
|
||||
|
||||
|
|
@ -125,6 +146,8 @@ static char *_e_str_list_remove(Evas_List **list, char *str);
|
|||
static void _e_path_fix_order(const char *path, const char *rel, int rel_to, int x, int y);
|
||||
static void _e_dir_del(E_Dir *ed);
|
||||
|
||||
static const char *_e_prepare_command(E_Fm_Op_Type type, const char *src, const char *dst);
|
||||
|
||||
#ifdef HAVE_EDBUS
|
||||
|
||||
#ifndef EAPI
|
||||
|
|
@ -168,6 +191,8 @@ static Ecore_Ipc_Server *_e_ipc_server = NULL;
|
|||
static Evas_List *_e_dirs = NULL;
|
||||
static Evas_List *_e_fops = NULL;
|
||||
static int _e_sync_num = 0;
|
||||
|
||||
static Evas_List *_e_fm_slaves = NULL;
|
||||
#ifdef HAVE_EDBUS
|
||||
static E_DBus_Connection *_e_dbus_conn = NULL;
|
||||
|
||||
|
|
@ -213,6 +238,21 @@ main(int argc, char **argv)
|
|||
ecore_file_init();
|
||||
ecore_ipc_init();
|
||||
|
||||
if (!e_prefix_determine(argv[0]))
|
||||
{
|
||||
fprintf(stderr,
|
||||
"ERROR: Enlightenment cannot determine its installed\n"
|
||||
" prefix from the system or argv[0].\n"
|
||||
" This is because it is not on Linux AND has been\n"
|
||||
" Executed strangely. This is unusual.\n"
|
||||
);
|
||||
e_prefix_fallback();
|
||||
}
|
||||
|
||||
ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_slave_data_cb, NULL);
|
||||
ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_slave_error_cb, NULL);
|
||||
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_slave_del_cb, NULL);
|
||||
|
||||
#ifdef HAVE_EDBUS
|
||||
_e_storage_volume_edd_init();
|
||||
e_dbus_init();
|
||||
|
|
@ -254,6 +294,8 @@ main(int argc, char **argv)
|
|||
_e_storage_volume_edd_shutdown();
|
||||
#endif
|
||||
|
||||
e_prefix_shutdown();
|
||||
|
||||
ecore_ipc_shutdown();
|
||||
ecore_file_shutdown();
|
||||
ecore_string_shutdown();
|
||||
|
|
@ -1111,16 +1153,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
|||
break;
|
||||
case 3: /* fop delete file/dir */
|
||||
{
|
||||
E_Fop *fop;
|
||||
|
||||
fop = calloc(1, sizeof(E_Fop));
|
||||
if (fop)
|
||||
{
|
||||
fop->id = e->ref;
|
||||
fop->src = evas_stringshare_add(e->data);
|
||||
_e_fops = evas_list_append(_e_fops, fop);
|
||||
fop->idler = ecore_idler_add(_e_cb_fop_rm_idler, fop);
|
||||
}
|
||||
_e_fm_slave_run(E_FM_OP_REMOVE, (const char *)e->data, NULL, e->ref);
|
||||
}
|
||||
break;
|
||||
case 4: /* fop trash file/dir */
|
||||
|
|
@ -1143,66 +1176,38 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
|||
|
||||
src = e->data;
|
||||
dst = src + strlen(src) + 1;
|
||||
ecore_file_mv(src, dst);
|
||||
/* FIXME: send back if succeeded or failed - why */
|
||||
_e_path_fix_order(dst, ecore_file_file_get(src), 2, -9999, -9999);
|
||||
|
||||
_e_fm_slave_run(E_FM_OP_MOVE, src, dst, e->ref);
|
||||
}
|
||||
break;
|
||||
case 6: /* fop mv file/dir */
|
||||
{
|
||||
E_Fop *fop;
|
||||
|
||||
fop = calloc(1, sizeof(E_Fop));
|
||||
if (fop)
|
||||
{
|
||||
const char *src, *dst, *rel;
|
||||
int rel_to, x, y;
|
||||
const char *src, *dst, *rel;
|
||||
int rel_to, x, y;
|
||||
|
||||
src = e->data;
|
||||
dst = src + strlen(src) + 1;
|
||||
rel = dst + strlen(dst) + 1;
|
||||
memcpy(&rel_to, rel + strlen(rel) + 1, sizeof(int));
|
||||
memcpy(&x, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
memcpy(&y, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
fop->id = e->ref;
|
||||
fop->src = evas_stringshare_add(src);
|
||||
fop->dst = evas_stringshare_add(dst);
|
||||
fop->rel = evas_stringshare_add(rel);
|
||||
fop->rel_to = rel_to;
|
||||
fop->x = x;
|
||||
fop->y = y;
|
||||
printf("MV %s to %s\n", fop->src, fop->dst);
|
||||
_e_fops = evas_list_append(_e_fops, fop);
|
||||
fop->idler = ecore_idler_add(_e_cb_fop_mv_idler, fop);
|
||||
}
|
||||
src = e->data;
|
||||
dst = src + strlen(src) + 1;
|
||||
rel = dst + strlen(dst) + 1;
|
||||
memcpy(&rel_to, rel + strlen(rel) + 1, sizeof(int));
|
||||
memcpy(&x, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
memcpy(&y, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
|
||||
_e_fm_slave_run(E_FM_OP_MOVE, src, dst, e->ref);
|
||||
}
|
||||
break;
|
||||
case 7: /* fop cp file/dir */
|
||||
{
|
||||
E_Fop *fop;
|
||||
|
||||
fop = calloc(1, sizeof(E_Fop));
|
||||
if (fop)
|
||||
{
|
||||
const char *src, *dst, *rel;
|
||||
int rel_to, x, y;
|
||||
const char *src, *dst, *rel;
|
||||
int rel_to, x, y;
|
||||
|
||||
src = e->data;
|
||||
dst = src + strlen(src) + 1;
|
||||
rel = dst + strlen(dst) + 1;
|
||||
memcpy(&rel_to, rel + strlen(rel) + 1, sizeof(int));
|
||||
memcpy(&x, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
memcpy(&y, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
fop->id = e->ref;
|
||||
fop->src = evas_stringshare_add(src);
|
||||
fop->dst = evas_stringshare_add(dst);
|
||||
fop->rel = evas_stringshare_add(rel);
|
||||
fop->rel_to = rel_to;
|
||||
fop->x = x;
|
||||
fop->y = y;
|
||||
_e_fops = evas_list_append(_e_fops, fop);
|
||||
fop->idler = ecore_idler_add(_e_cb_fop_cp_idler, fop);
|
||||
}
|
||||
src = e->data;
|
||||
dst = src + strlen(src) + 1;
|
||||
rel = dst + strlen(dst) + 1;
|
||||
memcpy(&rel_to, rel + strlen(rel) + 1, sizeof(int));
|
||||
memcpy(&x, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
memcpy(&y, rel + strlen(rel) + 1 + sizeof(int), sizeof(int));
|
||||
|
||||
_e_fm_slave_run(E_FM_OP_COPY, src, dst, e->ref);
|
||||
}
|
||||
break;
|
||||
case 8: /* fop mkdir */
|
||||
|
|
@ -1307,6 +1312,20 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
|||
/* FIXME: send back file add if succeeded */
|
||||
}
|
||||
break;
|
||||
case 14:/*error response*/
|
||||
{
|
||||
E_Fm_Op_Type type = *(E_Fm_Op_Type *)e->data;
|
||||
|
||||
_e_fm_slave_send(_e_fm_slave_get(e->ref), type, NULL, 0);
|
||||
}
|
||||
break;
|
||||
case 15:/*overwrite response*/
|
||||
{
|
||||
E_Fm_Op_Type type = *(E_Fm_Op_Type *)e->data;
|
||||
|
||||
_e_fm_slave_send(_e_fm_slave_get(e->ref), type, NULL, 0);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -1321,6 +1340,184 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int _e_client_send_overwrite(int id, const char *data, int size)
|
||||
{
|
||||
return ecore_ipc_server_send(_e_ipc_server,
|
||||
6/*E_IPC_DOMAIN_FM*/,
|
||||
15/*overwrite*/,
|
||||
id, 0, 0, data, size);
|
||||
}
|
||||
|
||||
static int _e_client_send_error(int id, const char *data, int size)
|
||||
{
|
||||
return ecore_ipc_server_send(_e_ipc_server,
|
||||
6/*E_IPC_DOMAIN_FM*/,
|
||||
14/*error*/,
|
||||
id, 0, 0, data, size);
|
||||
}
|
||||
|
||||
static int _e_client_send_progress(int id, const char *data, int size)
|
||||
{
|
||||
return ecore_ipc_server_send(_e_ipc_server,
|
||||
6/*E_IPC_DOMAIN_FM*/,
|
||||
16/*error*/,
|
||||
id, 0, 0, data, size);
|
||||
}
|
||||
static int _e_fm_slave_run(E_Fm_Op_Type type, const char *src, const char *dst, int id)
|
||||
{
|
||||
E_Fm_Slave *slave;
|
||||
const char *command;
|
||||
int result;
|
||||
|
||||
slave = malloc(sizeof(E_Fm_Slave));
|
||||
|
||||
if(!slave) return 0;
|
||||
|
||||
command = evas_stringshare_add(_e_prepare_command(type, src, dst));
|
||||
|
||||
slave->id = id;
|
||||
slave->exe = ecore_exe_pipe_run(command, ECORE_EXE_PIPE_WRITE | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR, slave );
|
||||
printf("EFM command: %s\n", command);
|
||||
|
||||
evas_stringshare_del(command);
|
||||
|
||||
_e_fm_slaves = evas_list_append(_e_fm_slaves, slave);
|
||||
|
||||
return (slave->exe != NULL);
|
||||
}
|
||||
|
||||
static E_Fm_Slave *_e_fm_slave_get(int id)
|
||||
{
|
||||
Evas_List *l = _e_fm_slaves;
|
||||
E_Fm_Slave *slave;
|
||||
|
||||
while(l)
|
||||
{
|
||||
slave = evas_list_data(l);
|
||||
|
||||
if(slave->id == id)
|
||||
return slave;
|
||||
|
||||
l = evas_list_next(l);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size)
|
||||
{
|
||||
void *sdata;
|
||||
int ssize;
|
||||
int magic = E_FM_OP_MAGIC;
|
||||
int result;
|
||||
|
||||
ssize = 3 * sizeof(int) + size;
|
||||
sdata = malloc(ssize);
|
||||
|
||||
if(!sdata) return 0;
|
||||
|
||||
memcpy(sdata, &magic, sizeof(int));
|
||||
memcpy(sdata + sizeof(int), &type, sizeof(E_Fm_Op_Type));
|
||||
memcpy(sdata + sizeof(int) + sizeof(E_Fm_Op_Type), &size, sizeof(int));
|
||||
|
||||
memcpy(sdata + 2 * sizeof(int) + sizeof(E_Fm_Op_Type), data, size);
|
||||
|
||||
result = ecore_exe_send(slave->exe, sdata, ssize);
|
||||
|
||||
free(sdata);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
static int _e_fm_slave_data_cb(void *data, int type, void *event)
|
||||
{
|
||||
Ecore_Exe_Event_Data *e = event;
|
||||
E_Fm_Slave *slave;
|
||||
int magic, id, size;
|
||||
int response[3];
|
||||
void *sdata;
|
||||
int ssize;
|
||||
|
||||
if(!e) return 1;
|
||||
|
||||
slave = ecore_exe_data_get(e->exe);
|
||||
|
||||
sdata = e->data;
|
||||
ssize = e->size;
|
||||
|
||||
while(ssize)
|
||||
{
|
||||
memcpy(&magic, sdata, sizeof(int));
|
||||
memcpy(&id, sdata + sizeof(int), sizeof(int));
|
||||
memcpy(&size, sdata + sizeof(int) + sizeof(int), sizeof(int));
|
||||
|
||||
if(magic != E_FM_OP_MAGIC)
|
||||
{
|
||||
DEBUG("%s:%s(%d) Wrong magic number from slave #%d. ", __FILE__, __FUNCTION__, __LINE__, slave->id);
|
||||
}
|
||||
|
||||
sdata += 3 * sizeof(int);
|
||||
ssize -= 3 * sizeof(int);
|
||||
|
||||
if(id == E_FM_OP_OVERWRITE)
|
||||
{
|
||||
response[0] = E_FM_OP_MAGIC;
|
||||
response[1] = E_FM_OP_OVERWRITE_RESPONSE_YES;
|
||||
response[2] = 0;
|
||||
|
||||
_e_client_send_overwrite(slave->id, (const char *)sdata, size);
|
||||
printf("%s:%s(%d) Overwrite response sent to slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id);
|
||||
}
|
||||
else if(id == E_FM_OP_ERROR)
|
||||
{
|
||||
_e_client_send_error(slave->id, (const char *)sdata, size);
|
||||
printf("%s:%s(%d) Error sent to client from slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id);
|
||||
}
|
||||
else if(id == E_FM_OP_PROGRESS)
|
||||
{
|
||||
_e_client_send_progress(slave->id, (const char *)sdata, size);
|
||||
printf("%s:%s(%d) Progress sent to client from slave #%d.\n", __FILE__, __FUNCTION__, __LINE__, slave->id);
|
||||
|
||||
}
|
||||
|
||||
sdata += size;
|
||||
ssize -= size;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int _e_fm_slave_error_cb(void *data, int type, void *event)
|
||||
{
|
||||
Ecore_Exe_Event_Data *e = event;
|
||||
E_Fm_Slave *slave;
|
||||
|
||||
if(e == NULL) return 1;
|
||||
|
||||
slave = ecore_exe_data_get(e->exe);
|
||||
|
||||
printf("EFM: Data from STDERR of slave #%d: %.*s", slave->id, e->size, e->data);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int _e_fm_slave_del_cb(void *data, int type, void *event)
|
||||
{
|
||||
Ecore_Exe_Event_Del *e = event;
|
||||
E_Fm_Slave *slave;
|
||||
|
||||
if(!e) return 1;
|
||||
|
||||
slave = ecore_exe_data_get(e->exe);
|
||||
|
||||
if(!slave) return 1;
|
||||
|
||||
_e_fm_slaves = evas_list_remove(_e_fm_slaves, (void *)slave);
|
||||
free(slave);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path)
|
||||
{
|
||||
|
|
@ -2167,3 +2364,65 @@ _e_dir_del(E_Dir *ed)
|
|||
}
|
||||
free(ed);
|
||||
}
|
||||
|
||||
static void _e_append_char(char **str, int *size, int c)
|
||||
{
|
||||
**str = c;
|
||||
(*str) ++;
|
||||
*size++;
|
||||
}
|
||||
|
||||
static void _e_append_quoted(char **str, int *size, const char *src)
|
||||
{
|
||||
while(*src)
|
||||
{
|
||||
if(*src == '\'')
|
||||
{
|
||||
_e_append_char(str, size, '\'');
|
||||
_e_append_char(str, size, '\\');
|
||||
_e_append_char(str, size, '\'');
|
||||
_e_append_char(str, size, '\'');
|
||||
}
|
||||
else
|
||||
_e_append_char(str, size, *src);
|
||||
|
||||
src++;
|
||||
}
|
||||
}
|
||||
/* Returns a string like
|
||||
* /usr/bin/englightement_op cp 'src' 'dst'
|
||||
* ready to pass to ecore_exe_pipe_run()
|
||||
*/
|
||||
|
||||
static const char *_e_prepare_command(E_Fm_Op_Type type, const char *src, const char *dst)
|
||||
{
|
||||
char buffer[PATH_MAX* 3 + 512];
|
||||
int length = 0;
|
||||
char *buf = &buffer[0];
|
||||
char command[3];
|
||||
|
||||
if(type == E_FM_OP_MOVE)
|
||||
strcpy(command, "mv");
|
||||
else if(type == E_FM_OP_REMOVE)
|
||||
strcpy(command, "rm");
|
||||
else
|
||||
strcpy(command, "cp");
|
||||
|
||||
length = snprintf(buf, sizeof(buffer), "%s/enlightenment_fm_op %s \'", e_prefix_bin_get(), command);
|
||||
buf += length;
|
||||
|
||||
_e_append_quoted(&buf, &length, src);
|
||||
_e_append_char(&buf, &length, '\'');
|
||||
|
||||
if(dst)
|
||||
{
|
||||
_e_append_char(&buf, &length, ' ');
|
||||
_e_append_char(&buf, &length, '\'');
|
||||
_e_append_quoted(&buf, &length, dst);
|
||||
_e_append_char(&buf, &length, '\'');
|
||||
}
|
||||
|
||||
_e_append_char(&buf, &length, '\x00');
|
||||
|
||||
return strdup(&buffer[0]);
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* vim:cindent:ts=8:sw=3:sts=8:expandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#ifndef _E_FM_OP_H
|
||||
#define _E_FM_OP_H
|
||||
|
||||
#define E_FM_OP_DEBUG(...) fprintf(stderr, __VA_ARGS__)
|
||||
|
||||
#define E_FM_OP_MAGIC 314
|
||||
|
||||
typedef enum _E_Fm_Op_Type
|
||||
{
|
||||
E_FM_OP_COPY = 0,
|
||||
E_FM_OP_MOVE = 1,
|
||||
E_FM_OP_REMOVE = 2,
|
||||
E_FM_OP_ABORT = 3,
|
||||
E_FM_OP_ERROR = 4,
|
||||
E_FM_OP_ERROR_RESPONSE_IGNORE_THIS = 5,
|
||||
E_FM_OP_ERROR_RESPONSE_IGNORE_ALL = 6,
|
||||
E_FM_OP_ERROR_RESPONSE_ABORT = 7,
|
||||
E_FM_OP_PROGRESS = 8,
|
||||
E_FM_OP_NONE = 9,
|
||||
E_FM_OP_ERROR_RESPONSE_RETRY = 10,
|
||||
E_FM_OP_OVERWRITE = 11,
|
||||
E_FM_OP_OVERWRITE_RESPONSE_NO = 12,
|
||||
E_FM_OP_OVERWRITE_RESPONSE_NO_ALL = 13,
|
||||
E_FM_OP_OVERWRITE_RESPONSE_YES = 14,
|
||||
E_FM_OP_OVERWRITE_RESPONSE_YES_ALL = 15,
|
||||
E_FM_OP_COPY_STAT_INFO = 16
|
||||
} E_Fm_Op_Type;
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue