enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

enlightenment_fm_open to open directories from command line. 

This command line tool will make it easier to open directories from
command line, instead of calling
   enlightenment_remote -exec-action fileman "PATH"

It has the advantage of being much simpler and smaller and also
resolving the realpath for you.

If there is no such action "fileman" (ie: module is not loaded), then
it will return failure. To implement this I had to change the
-exec-action so it returns a boolean (it will report that value with
enlightenment_remote as well).




SVN revision: 37861
This commit is contained in:
Gustavo Sverzut Barbieri 2008-11-30 02:12:52 +00:00
parent 8010e152c1
commit 7e1caa6740
4 changed files with 253 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/Makefile.am
View File

@ -22,7 +22,8 @@ enlightenment_thumb \
enlightenment_sys \
enlightenment_fm \
enlightenment_init \
enlightenment_fm_op
enlightenment_fm_op \
enlightenment_fm_open
ENLIGHTENMENTHEADERS = \
e.h \
@ -346,11 +347,18 @@ enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@
enlightenment_fm_CFLAGS = $(INCLUDES)
enlightenment_fm_op_SOURCES = \
e_fm_op.c
e_fm_op.c
enlightenment_fm_op_LDFLAGS = @e_libs@
enlightenment_fm_op_CFLAGS = $(INCLUDES)
enlightenment_fm_open_SOURCES = \
e_fm_open.c \
e_ipc_codec.c
enlightenment_fm_open_LDFLAGS = @e_libs@
enlightenment_fm_open_CFLAGS = $(INCLUDES)
enlightenment_sys_SOURCES = \
e_sys_main.c

213
src/bin/e_fm_open.c Normal file
View File

@ -0,0 +1,213 @@
#include "e.h"
#include <Ecore_Getopt.h>
#include <limits.h>
#include <errno.h>
#ifdef USE_IPC
static void
_ipc_socket_help(void)
{
fputs("The E_IPC_SOCKET environment variable is not set or invalid.\n"
"This is exported by Enlightenment to all processes it launches.\n"
"This environment variable must be set and must point to "
"Enlightenment's IPC socket file (minus '|' and port number).\n",
stderr);
}
static int
_ipc_server_add(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Add *e = event;
const char *directory = data;
void *d;
int len;
d = e_ipc_codec_2str_enc("fileman", directory, &len);
if (!d)
{
fputs("ERROR: could not encode IPC command.\n", stderr);
return 1;
}
ecore_ipc_server_send
(e->server, E_IPC_DOMAIN_REQUEST, E_IPC_OP_EXEC_ACTION, 0, 0, 0, d, len);
free(d);
return 1;
}
static int
_ipc_server_data(void *data, int type, void *event)
{
Ecore_Ipc_Event_Server_Data *e = event;
int *exit_code = data;
switch (e->minor)
{
case E_IPC_OP_EXEC_ACTION_REPLY:
if (e->data)
{
if (!e_ipc_codec_int_dec(e->data, e->size, exit_code))
fputs("ERROR: could not decode integer from reply.\n", stderr);
}
ecore_main_loop_quit();
break;
default:
fprintf(stderr, "ERROR: unexpected reply from server with minor %d, "
"expected %d\n", e->minor, E_IPC_OP_EXEC_ACTION);
break;
}
return 1;
}
static Ecore_Ipc_Server *
_ipc_init(void)
{
char *spath;
spath = getenv("E_IPC_SOCKET");
if (!spath)
return NULL;
return ecore_ipc_server_connect(ECORE_IPC_LOCAL_SYSTEM, spath, 0, NULL);
}
static void
_ipc_shutdown(Ecore_Ipc_Server *s)
{
if (!s)
return;
ecore_ipc_server_del(s);
}
static int
_signal_exit(void *data, int ev_type, void *ev)
{
ecore_main_loop_quit();
return 1;
}
static const Ecore_Getopt options = {
"enlightenment_fm_open",
"%prog <directory>",
PACKAGE_VERSION,
"(C) 2008 Enlightenment, see AUTHORS.",
"BSD with advertisement, see COPYING.",
"Open directories with Enlightenment File Manager.",
1,
{
ECORE_GETOPT_VERSION('V', "version"),
ECORE_GETOPT_COPYRIGHT('R', "copyright"),
ECORE_GETOPT_LICENSE('L', "license"),
ECORE_GETOPT_HELP('h', "help"),
ECORE_GETOPT_SENTINEL
}
};
#endif /* USE_IPC */
int
main(int argc, char **argv)
{
#ifdef USE_IPC
unsigned char exit_option = 0;
Ecore_Getopt_Value values[] = {
ECORE_GETOPT_VALUE_BOOL(exit_option),
ECORE_GETOPT_VALUE_BOOL(exit_option),
ECORE_GETOPT_VALUE_BOOL(exit_option),
ECORE_GETOPT_VALUE_BOOL(exit_option),
ECORE_GETOPT_VALUE_NONE
};
int nonargs, action_ret, ret = -1;
const char *arg;
char directory[PATH_MAX];
Ecore_Ipc_Server *server = NULL;
if (ecore_init() <= 0)
{
fputs("ERROR: could not initialize ecore!\n", stderr);
return -1;
}
if (ecore_ipc_init() <= 0)
{
fputs("ERROR: could not initialize ecore_ipc!\n", stderr);
goto failed_ecore_ipc;
}
ecore_app_args_set(argc, (const char **)argv);
nonargs = ecore_getopt_parse(&options, values, argc, argv);
if (nonargs < 0)
{
ret = nonargs;
goto failed_args;
}
if (exit_option)
goto found_exit_option;
if (nonargs == argc)
{
fputs("WARNING: missing directory to open, using $HOME\n", stderr);
arg = getenv("HOME");
if (!arg)
{
fputs("ERROR: no directory to open and no $HOME.\n", stderr);
goto missing_args;
}
}
else
{
arg = argv[nonargs];
if (strcmp(arg, "file://") == 0)
arg += sizeof("file://") - 1;
}
if (realpath(arg, directory) == NULL)
{
fprintf(stderr, "ERROR: invalid directory \"%s\": %s\n",
directory, strerror(errno));
goto missing_args;
}
server = _ipc_init();
if (!server)
{
fputs("ERROR: could not connect to server.\n", stderr);
goto failed_ipc;
}
if (e_ipc_codec_init() <= 0)
{
fputs("ERROR: could not initialize e_ipc_codec!\n", stderr);
goto failed_ipc_codec;
}
action_ret = 0;
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _signal_exit, NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, _ipc_server_add, directory);
ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, _ipc_server_data, &action_ret);
ecore_main_loop_begin();
ret = action_ret ? 0 : -1;
e_ipc_codec_shutdown();
failed_ipc_codec:
_ipc_shutdown(server);
failed_ipc:
missing_args:
found_exit_option:
failed_args:
ecore_ipc_shutdown();
failed_ecore_ipc:
ecore_shutdown();
return ret;
#else /* USE_IPC */
fputs("ERROR: this application cannot work without ecore IPC.\n", stderr);
return 0;
#endif
}

36
src/bin/e_ipc_handlers.h
View File

@ -4728,36 +4728,52 @@ break;
/****************************************************************************/
#define HDL E_IPC_OP_EXEC_ACTION
#if (TYPE == E_REMOTE_OPTIONS)
OP("-exec-action", 2, "Executes an action given the name (OPT1) and a string of parameters (OPT2).", 0, HDL)
OP("-exec-action", 2, "Executes an action given the name (OPT1) and a string of parameters (OPT2).", 1, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_2STRING(params[0], params[1], HDL);
#elif (TYPE == E_WM_IN)
STRING2(actionName, paramList, e_2str, HDL);
{
Eina_List *m;
E_Manager *man;
E_Action *act;
man = NULL;
m = e_manager_list();
Eina_List *m = e_manager_list();
int ok = 0;
if (m) {
man = m->data;
E_Manager *man = m->data;
if (man) {
act = e_action_find(actionName);
E_Action *act = e_action_find(actionName);
if (act && act->func.go) {
act->func.go(E_OBJECT(man), paramList);
ok = 1;
}
}
}
void *d;
int len;
d = e_ipc_codec_int_enc(ok, &len);
if (d) {
ecore_ipc_client_send(e->client, E_IPC_DOMAIN_REPLY, E_IPC_OP_EXEC_ACTION_REPLY, 0, 0, 0, d, len);
free(d);
}
}
END_STRING2(e_2str)
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
/****************************************************************************/
#define HDL E_IPC_OP_EXEC_ACTION_REPLY
#if (TYPE == E_REMOTE_OPTIONS)
#elif (TYPE == E_REMOTE_OUT)
#elif (TYPE == E_WM_IN)
#elif (TYPE == E_REMOTE_IN)
START_INT(val, HDL);
printf("REPLY: %d\n", val);
END_INT;
#endif
#undef HDL
/****************************************************************************/
#define HDL E_IPC_OP_THEME_LIST
#if (TYPE == E_REMOTE_OPTIONS)

5
src/bin/e_ipc_handlers_list.h
View File

@ -200,7 +200,7 @@
#define E_IPC_OP_FOCUS_SETTING_SET 196
#define E_IPC_OP_FOCUS_SETTING_GET 197
#define E_IPC_OP_FOCUS_SETTING_GET_REPLY 198
#define E_IPC_OP_EXEC_ACTION 199
// 199 is vacant
#define E_IPC_OP_THEME_LIST 200
#define E_IPC_OP_THEME_LIST_REPLY 201
#define E_IPC_OP_THEME_GET 202
@ -419,3 +419,6 @@
#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_SET 383
#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET 384
#define E_IPC_OP_DESKLOCK_CUSTOM_DESKLOCK_CMD_GET_REPLY 385
#define E_IPC_OP_EXEC_ACTION 386
#define E_IPC_OP_EXEC_ACTION_REPLY 387