2002-02-25 Lutz M�ller <lutz@users.sourceforge.net>

* acconfig.h:
        * configure.in: Add optional readline support.
        * frontends/command-line/main.c: Show remaining time in progress bar.
        * frontends/command-line/globals.h: Export glob_cancel.
        * frontends/command-line/shell.[c,h]: Clean up and add (optional)
          readline support. Support deletion of files.

2002-02-25  Lutz M�ller <lutz@users.sourceforge.net>

        * configure.in: Version 2.0


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@4216 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2002-02-25 15:20:03 +00:00
parent 7ec2091167
commit d3d342deda
8 changed files with 689 additions and 232 deletions

View File

@@ -1,3 +1,16 @@
2002-02-25 Lutz Müller <lutz@users.sourceforge.net>
* acconfig.h:
* configure.in: Add optional readline support.
* frontends/command-line/main.c: Show remaining time in progress bar.
* frontends/command-line/globals.h: Export glob_cancel.
* frontends/command-line/shell.[c,h]: Clean up and add (optional)
readline support. Support deletion of files.
2002-02-25 Lutz Müller <lutz@users.sourceforge.net>
* configure.in: Version 2.0
2002-02-23 Lutz Müller <lutz@users.sourceforge.net>
Patch from Patrick Mansfield <patman@aracnet.com>:

View File

@@ -21,5 +21,6 @@
#undef HAVE_AA
#undef HAVE_JPEG
#undef HAVE_EXIF
#undef HAVE_RL
#undef DISABLE_DEBUGGING

View File

@@ -387,6 +387,33 @@ AM_CONDITIONAL(HAVE_AA, $have_aa)
AC_SUBST(AA_LIBS)
AC_SUBST(AA_CFLAGS)
dnl ---------------------------------------------------------------------------
dnl readline: Readline is pretty cool - it allows you to use <tab> to complete
dnl commands in the gphoto2 shell or to use <up> or <down> to
dnl navigate through the history.
dnl ---------------------------------------------------------------------------
rl_msg="no (cnswww.cns.cwru.edu/~chet/readline/rltop.html)"
try_rl=true
have_rl=false
AC_ARG_WITH(readline, [ --without-readline Don't use readline],
if test x$withval = xno; then
try_readline=false
fi
)
if $try_readline; then
AC_CHECK_HEADER(readline/readline.h,[
have_readline=true
rl_msg=yes
AC_DEFINE(HAVE_RL)
RL_LIBS=-lreadline
RL_CFLAGS=""])
else
rl_msg="no (not requested)"
fi
AM_CONDITIONAL(HAVE_RL, $have_rl)
AC_SUBST(RL_LIBS)
AC_SUBST(RL_CFLAGS)
dnl ---------------------------------------------------------------------------
dnl Configure libgphoto2-port
dnl ---------------------------------------------------------------------------
@@ -454,4 +481,5 @@ Configuration (libgphoto2):
JPEG support: $jpeg_msg
pkg-config: $pkgconfig_msg
EXIF support: $exif_msg
readline support: $rl_msg
"

View File

@@ -20,7 +20,8 @@ INCLUDES = \
-I$(top_srcdir)/libgphoto2 \
$(CDK_CFLAGS) \
$(AA_CFLAGS) \
$(EXIF_CFLAGS)
$(EXIF_CFLAGS) \
$(RL_CFLAGS)
if HAVE_CDK
CDK_FILES = gphoto2-cmd-config.c gphoto2-cmd-config.h
@@ -53,7 +54,7 @@ gphoto2_LDADD = \
$(top_builddir)/libgphoto2/libgphoto2.la \
$(AA_LIBS) \
$(JPEG_LIBS) \
$(INTLLIBS)
$(EXIF_LIBS) $(INTLLIBS) $(RL_LIBS)
# Special rule for regenerating the man page from the XML file.
# This requires xmlto, which can be obtained from

View File

@@ -1,3 +1,4 @@
extern char glob_cancel;
extern char glob_port[];
extern char glob_model[];
extern char glob_folder[];

View File

@@ -26,6 +26,9 @@
#include <string.h>
#include <unistd.h>
#include <locale.h>
#ifdef HAVE_RL
#include <readline/readline.h>
#endif
#ifndef WIN32
#include <signal.h>
@@ -262,7 +265,8 @@ int glob_filename_override=0;
char glob_filename[128];
int glob_stdout=0;
int glob_stdout_size=0;
static char glob_cancel = 0;
char glob_cancel = 0;
static int glob_cols = 80;
static ForEachFlags glob_flags = FOR_EACH_FLAGS_RECURSE;
@@ -800,6 +804,7 @@ save_camera_file_to_file (CameraFile *file, CameraFileType type)
break;
do {
putchar('\007');
printf(_("File %s exists. Overwrite? [y|n] "),buf);
fflush(stdout);
fgets(c, 1023, stdin);
@@ -1318,26 +1323,23 @@ ctx_error_func (GPContext *context, const char *format, va_list args,
#define MAX_PROGRESS_STATES 16
#define MAX_MSG_LEN 48
#define MAX_MSG_LEN 1024
static struct {
char message[MAX_MSG_LEN + 1];
float target;
unsigned long int count;
struct {
float current;
time_t time, left;
} last;
} progress_states[MAX_PROGRESS_STATES];
static const char bar[] =
"==============================================================="
"===============================================================";
static const char spaces[] =
" "
" ";
static unsigned int
ctx_progress_start_func (GPContext *context, float target,
const char *format, va_list args, void *data)
{
unsigned int id;
unsigned int id, len;
static unsigned char initialized = 0;
if (!initialized) {
@@ -1345,6 +1347,12 @@ ctx_progress_start_func (GPContext *context, float target,
initialized = 1;
}
/*
* If the message is too long, we will shorten it. If we have less
* than 4 cols available, we won't display any message.
*/
len = (glob_cols * 0.5 < 4) ? 0 : MIN (glob_cols * 0.5, MAX_MSG_LEN);
/* Remember message and target. */
for (id = 0; id < MAX_PROGRESS_STATES; id++)
if (!progress_states[id].target)
@@ -1352,15 +1360,17 @@ ctx_progress_start_func (GPContext *context, float target,
if (id == MAX_PROGRESS_STATES)
id--;
progress_states[id].target = target;
vsnprintf (progress_states[id].message, MAX_MSG_LEN + 1, format, args);
vsnprintf (progress_states[id].message, len + 1, format, args);
progress_states[id].count = 0;
progress_states[id].last.time = time (NULL);
progress_states[id].last.current = progress_states[id].last.left = 0.;
/* If message is too long, shorten it. */
if (progress_states[id].message[MAX_MSG_LEN - 1]) {
progress_states[id].message[MAX_MSG_LEN - 1] = '\0';
progress_states[id].message[MAX_MSG_LEN - 2] = '.';
progress_states[id].message[MAX_MSG_LEN - 3] = '.';
progress_states[id].message[MAX_MSG_LEN - 4] = '.';
if (progress_states[id].message[len - 1]) {
progress_states[id].message[len - 1] = '\0';
progress_states[id].message[len - 2] = '.';
progress_states[id].message[len - 3] = '.';
progress_states[id].message[len - 4] = '.';
}
return (id);
@@ -1371,39 +1381,79 @@ ctx_progress_update_func (GPContext *context, unsigned int id,
float current, void *data)
{
static const char spinner[] = "\\|/-";
unsigned int i, width;
unsigned int i, width, pos;
float rate;
char remaining[10], buf[4];
time_t sec = 0;
/* Guard against buggy camera drivers */
if (id >= MAX_PROGRESS_STATES || id < 0)
return;
width = 66 - strlen (progress_states[id].message);
i = ((MIN (current / progress_states[id].target, 100.) * width) + 0.5);
/* How much time until completion? */
if ((time (NULL) - progress_states[id].last.time > 0) &&
(current - progress_states[id].last.current > 0)) {
rate = (time (NULL) - progress_states[id].last.time) /
(current - progress_states[id].last.current);
sec = (MAX (0, progress_states[id].target - current)) * rate;
if (progress_states[id].last.left) {
sec += progress_states[id].last.left;
sec /= 2.;
}
progress_states[id].last.time = time (NULL);
progress_states[id].last.current = current;
progress_states[id].last.left = sec;
} else
sec = progress_states[id].last.left;
memset (remaining, 0, sizeof (remaining));
if ((int) sec >= 3600) {
snprintf (buf, sizeof (buf), "%2ih", (int) sec / 3600);
sec -= ((int) (sec / 3600) * 3600);
strncat (remaining, buf, sizeof (remaining) - 1);
}
if ((int) sec >= 60) {
snprintf (buf, sizeof (buf), "%2im", (int) sec / 60);
sec -= ((int) (sec / 60) * 60);
strncat (remaining, buf, sizeof (remaining) - 1);
}
if ((int) sec) {
snprintf (buf, sizeof (buf), "%2is", (int) sec);
strncat (remaining, buf, sizeof (remaining) - 1);
}
fprintf (stdout, "%s |%s%s", progress_states[id].message,
bar + sizeof (bar) - (i + 1),
spaces + (sizeof (spaces) - (width - i + 1)));
/* Determine the width of the progress bar and the current position */
width = MAX (0, (int) glob_cols -
strlen (progress_states[id].message) - 20);
pos = MIN (width, (MIN (current / progress_states[id].target, 100.) * width) + 0.5);
if (current == 100.)
/* Print the progress bar */
fprintf (stdout, "%s |", progress_states[id].message);
for (i = 0; i < width; i++)
fprintf (stdout, (i < pos) ? "-" : " ");
if (pos == width)
fputc ('|', stdout);
else
fputc (spinner[progress_states[id].count & 0x03], stdout);
progress_states[id].count++;
fprintf (stdout, " %5.1f%% \r",
current / progress_states[id].target * 100.);
fprintf (stdout, " %5.1f%% %9.9s\r",
current / progress_states[id].target * 100., remaining);
fflush (stdout);
}
static void
ctx_progress_stop_func (GPContext *context, unsigned int id, void *data)
{
unsigned int i;
/* Guard against buggy camera drivers */
if (id >= MAX_PROGRESS_STATES || id < 0)
return;
/* Clear the progress bar. */
fprintf (stdout, "%s\r", spaces + (sizeof(spaces) - 80));
for (i = 0; i < glob_cols; i++)
fprintf (stdout, " ");
fprintf (stdout, "\r");
fflush (stdout);
progress_states[id].target = 0.;
@@ -1502,6 +1552,16 @@ cli_error_print (char *format, ...)
fprintf(stderr, "\n");
}
static void
signal_resize (int signo)
{
const char *columns;
columns = getenv ("COLUMNS");
if (columns && atoi (columns))
glob_cols = atoi (columns);
}
static void
signal_exit (int signo)
{
@@ -1544,6 +1604,10 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, GPHOTO2_LOCALEDIR);
textdomain (PACKAGE);
/* Figure out the width of the terminal and watch out for changes */
signal_resize (0);
signal (SIGWINCH, signal_resize);
/* Initialize the globals */
init_globals ();

View File

@@ -1,41 +1,139 @@
/* shell.c:
*
* Copyright (C) 2002 Lutz Müller <lutz@users.sourceforge.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include "shell.h"
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_RL
# include <readline/readline.h>
# include <readline/history.h>
#endif
#include "main.h"
#include "globals.h"
#include "shell.h"
#include "actions.h"
#ifdef ENABLE_NLS
# include <libintl.h>
# undef _
# define _(String) dgettext (PACKAGE, String)
# ifdef gettext_noop
# define N_(String) gettext_noop (String)
# else
# define N_(String) (String)
# endif
#else
# define textdomain(String) (String)
# define gettext(String) (String)
# define dgettext(Domain,Message) (Message)
# define dcgettext(Domain,Message,Type) (Message)
# define bindtextdomain(Domain,Directory) (Domain)
# define _(String) (String)
# define N_(String) (String)
#endif
#define CHECK(result) {int r=(result);if(r<0) return(r);}
#define CHECK_CONT(result) {int r=(result);if(r<0){printf ("*** Error ('%s') ***\n", gp_result_as_string (result));}}
#define CHECK_CONT(result) \
{ \
int r = (result); \
\
if (r < 0) { \
if (r == GP_ERROR_CANCEL) { \
glob_cancel = 0; \
} else { \
printf (_("*** Error (%i: '%s') ***"), \
r, gp_result_as_string (r)); \
printf ("\n"); \
} \
} \
}
/* Valid shell commands */
shell_function func[] = {
{"cd", shell_cd, "Change to a directory on the camera", "directory"},
{"lcd", shell_lcd, "Change to a directory on the local drive", "directory"},
{"exit", shell_exit, "Exit the gPhoto shell", ""},
{"get", shell_get, "Download the file to the current directory", "[directory/]filename"},
{"get-thumbnail", shell_get_thumbnail, "Download the thumbnail to the current directory", "[directory/]filename"},
{"get-raw", shell_get_raw, "Download raw data to the current directory", "[directory/]filename"},
{"help", shell_help, "Displays command usage", "command"},
{"ls", shell_ls, "List the contents of the current directory", "[directory/]"},
{"q", shell_exit, "Exit the gPhoto shell", ""},
{"quit", shell_exit, "Exit the gPhoto shell", ""},
{"?", shell_help, "Displays command usage", ""},
{"", NULL}
/* Forward declarations */
static int shell_cd (const char *);
static int shell_lcd (const char *);
static int shell_exit (const char *);
static int shell_get (const char *);
static int shell_get_thumbnail (const char *);
static int shell_get_raw (const char *);
static int shell_del (const char *);
static int shell_help (const char *);
static int shell_ls (const char *);
static int shell_exit (const char *);
static int shell_show_info (const char *);
#ifdef HAVE_EXIF
static int shell_show_exif (const char *);
#endif
typedef int (* ShellFunction) (const char *arg);
typedef struct _ShellFunctionTable ShellFunctionTable;
struct _ShellFunctionTable {
const char *command;
ShellFunction function;
const char *description;
const char *description_arg;
unsigned char arg_required;
} func[] = {
{"cd", shell_cd, N_("Change to a directory on the camera"),
N_("directory"), 1},
{"lcd", shell_lcd, N_("Change to a directory on the local drive"),
N_("directory"), 1},
{"exit", shell_exit, N_("Exit the gPhoto shell"), NULL, 0},
{"get", shell_get, N_("Download a file"), N_("[directory/]filename"),
1},
{"get-thumbnail", shell_get_thumbnail, N_("Download a thumbnail"),
N_("[directory/]filename"), 1},
{"get-raw", shell_get_raw, N_("Download raw data"),
N_("[directory/]filename"), 1},
{"show-info", shell_show_info, N_("Show info"),
N_("[directory/]filename"), 1},
{"delete", shell_del, N_("Delete"), N_("[directory/]filename"), 1},
#ifdef HAVE_EXIF
{"show-exif", shell_show_exif, N_("Show EXIF information"),
N_("[directory/]filename"), 1},
#endif
{"help", shell_help, N_("Displays command usage"),
N_("[command]"), 0},
{"ls", shell_ls, N_("List the contents of the current directory"),
N_("[directory/]"), 0},
{"q", shell_exit, N_("Exit the gPhoto shell"), NULL, 0},
{"quit", shell_exit, N_("Exit the gPhoto shell"), NULL, 0},
{"?", shell_help, N_("Displays command usage"), N_("[command]"), 0},
{"", NULL, NULL, NULL}
};
/* Local globals */
char* shell_prompt_text = "gphoto: {%s} %s> ";
#define SHELL_PROMPT "gphoto2: {%s} %s> "
int shell_done = 0;
static int
shell_arg_count (char *args)
shell_arg_count (const char *args)
{
int x=0, in_arg=0, count=0;
while (x < strlen(args)) { /* Edge-triggered */
while (x < strlen (args)) {
if ((!isspace(args[x])) && (!in_arg)) {
in_arg = 1;
count++;
@@ -48,8 +146,42 @@ shell_arg_count (char *args)
return (count);
}
static char *
shell_read_line (void)
{
char prompt[70], buf[1024], *line;
if (glob_quiet)
snprintf (prompt, sizeof (prompt), SHELL_PROMPT, "\0", "\0");
else {
if (strlen (glob_cwd) > 25) {
strncpy (buf, "...", sizeof (buf));
strncat (buf, &glob_cwd[strlen (glob_cwd) - 22],
sizeof (buf));
snprintf (prompt, sizeof (prompt), SHELL_PROMPT, buf,
glob_folder);
} else
snprintf (prompt, sizeof (prompt), SHELL_PROMPT,
glob_cwd, glob_folder);
}
#ifdef HAVE_RL
line = readline (prompt);
if (line)
add_history (line);
#else
line = malloc (1024);
if (!line)
return (NULL);
printf (shell_prompt_text, prompt, glob_folder);
fflush(stdout);
fgets (line, 1023, stdin);
line[strlen (line) - 1] = '\0';
#endif
return (line);
}
static int
shell_arg (char *args, int arg_num, char *arg)
shell_arg (const char *args, int arg_num, char *arg)
{
int x=0, y=0, in_arg=0, count=0, copy=0;
@@ -78,134 +210,290 @@ shell_arg (char *args, int arg_num, char *arg)
return (GP_OK);
}
#ifdef HAVE_RL
static char *
shell_command_generator (const char *text, int state)
{
static int x, len;
/* If this is a new command to complete, reinitialize */
if (!state) {
x = 0;
len = strlen (text);
}
/* Search 'text' */
for (; func[x].command; x++)
if (!strncmp (func[x].command, text, len))
break;
if (func[x].command)
return (strdup (func[x++].command));
return (NULL);
}
static char *
shell_path_generator (const char *text, int state)
{
static int x, len;
const char *slash, *name, *basename;
CameraList list;
int count, r;
char folder[1024];
/* If this is a new path to complete, reinitialize */
if (!state) {
x = 0;
len = strlen (text);
}
slash = strrchr (text, '/');
if (slash) {
strncpy (folder, text, MIN (sizeof (folder), slash - text));
basename = slash + 1;
} else {
strncpy (folder, glob_folder, sizeof (folder));
basename = text;
}
/* First search for matching file */
r = gp_camera_folder_list_files (glob_camera, folder,
&list, glob_context);
if (r < 0)
return (NULL);
count = gp_list_count (&list);
if (count < 0)
return (NULL);
if (x < count) {
for (; x < count; x++) {
r = gp_list_get_name (&list, x, &name);
if (r < 0)
return (NULL);
if (!strncmp (name, basename, len)) {
x++;
return (strdup (name));
}
}
} else {
r = gp_camera_folder_list_folders (glob_camera, folder,
&list, glob_context);
if (r < 0)
return (NULL);
count = gp_list_count (&list);
if (count < 0)
return (NULL);
if (x < count) {
for (; x < count; x++) {
r = gp_list_get_name (&list, x, &name);
if (r < 0)
return (NULL);
if (!strncmp (name, basename, len)) {
x++;
return (strdup (name));
}
}
}
}
return (NULL);
}
static char **
shell_completion_function (const char *text, int start, int end)
{
char **matches = NULL;
char *current;
if (!text)
return (NULL);
if (!start) {
/* Complete command */
matches = rl_completion_matches (text, shell_command_generator);
} else {
current = strdup (rl_copy_text (0, end));
/* Complete local path? */
if (!strncmp (current, "lcd", strlen ("lcd"))) {
free (current);
return (NULL);
}
free (current);
/* Complete remote path */
matches = rl_completion_matches (text, shell_path_generator);
}
return (matches);
}
#endif /* HAVE_RL */
int
shell_prompt (void)
{
int x;
char buf[1024], cmd[1024], arg[1024];
char cmd[1024], arg[1024], *line;
while (!shell_done) {
if (glob_quiet) {
printf(">\n");
} else {
if (strlen(glob_cwd) > 25) {
strcpy(buf, "...");
strcat(buf, &glob_cwd[strlen(glob_cwd)-22]);
} else {
strcpy(buf, glob_cwd);
}
printf(shell_prompt_text, buf, glob_folder); /* Display prompt text */
}
fflush(stdout);
fgets(buf, 1023, stdin); /* Get the command/args */
buf[strlen(buf)-1]=0; /* Chop the newline */
#ifdef HAVE_RL
rl_attempted_completion_function = shell_completion_function;
#endif
/* Extract command and argument */
while (!shell_done && !glob_cancel) {
line = shell_read_line ();
if (!line)
continue;
/* If we don't have any command, start from the beginning */
if (shell_arg_count (buf) <= 0)
if (shell_arg_count (line) <= 0) {
free (line);
continue;
shell_arg (buf, 0, cmd);
strcpy(arg, &buf[strlen(cmd)]);
for (x = 0; func[x].function; x++) {
if (!strcmp (cmd, func[x].command)) {
CHECK_CONT (func[x].function (arg));
break;
}
}
if (!func[x].function)
cli_error_print ("Invalid command");
shell_arg (line, 0, cmd);
strcpy (arg, &line[strlen (cmd)]);
free (line);
/* Search the command */
for (x = 0; func[x].function; x++)
if (!strcmp (cmd, func[x].command))
break;
if (!func[x].function) {
cli_error_print (_("Invalid command."));
continue;
}
/*
* If the command requires an argument, complain if this
* argument is not given.
*/
if (func[x].arg_required && !shell_arg_count (arg)) {
printf (_("The command '%s' requires "
"an argument."), cmd);
printf ("\n");
continue;
}
/* Execute the command */
CHECK_CONT (func[x].function (arg));
}
return (GP_OK);
}
#define MAX_FOLDER_LEN 1024
#define MAX_FILE_LEN 1024
static int
shell_get_new_folder (char *relative_path, char *cd_arg, char *new_folder)
shell_construct_path (const char *folder_orig, const char *rel_path,
char *dest_folder, char *dest_filename)
{
/*
Find what the new folder will be based on the "cd" or "ls" argument.
This can take paths like:
"/blah", "./blah", "../blah", "/blah/hey/../doh/blah", etc...
*/
const char *slash;
unsigned int len;
char *dir = NULL, *slash = NULL;
char tmp_folder[1024];
int append = 0, x=0;
if (!folder_orig || !rel_path || !dest_folder)
return (GP_ERROR);
while (isspace(cd_arg[x])) {x++;}
memset (dest_folder, 0, MAX_FOLDER_LEN);
if (dest_filename)
memset (dest_filename, 0, MAX_FILE_LEN);
if (cd_arg[x] == '/') /* Check if path is relative to root */
strcpy(tmp_folder, "/");
else
strcpy(tmp_folder, relative_path);
do {
append = 1;
if (!dir) /* Get each directory individually */
dir = strtok(&cd_arg[x], "/");
else
dir = strtok(NULL, "/");
if (!dir)
break;
/* Skip leading spaces */
while (rel_path[0] == ' ')
rel_path++;
if (strcmp(dir, ".")==0) /* Do nothing for CWD */
append = 0;
/*
* Consider folder_orig only if we are really given a relative
* path.
*/
if (rel_path[0] != '/')
strncpy (dest_folder, folder_orig, MAX_FOLDER_LEN);
else {
while (rel_path[0] == '/')
rel_path++;
}
if (strcmp(dir, "..")==0) { /* Move up a directory */
if (strcmp(tmp_folder, "/")!=0) {
slash = strrchr(tmp_folder, '/');
*slash = 0;
if (strlen(tmp_folder)==0)
strcpy(tmp_folder, "/");
}
append = 0;
while (rel_path) {
if (!strncmp (rel_path, "./", 2) || !strcmp (rel_path, ".")) {
rel_path += MIN (strlen (rel_path), 2);
continue;
}
if (!strncmp (rel_path, "../", 3) || !strcmp (rel_path, "..")) {
rel_path += MIN (3, strlen (rel_path));
if (append) { /* Append the dir name */
if (strcmp(tmp_folder, "/")!=0)
strcat(tmp_folder, "/");
strcat(tmp_folder, dir);
/* Go up one folder */
slash = strrchr (dest_folder, '/');
if (!slash) {
cli_error_print (_("Invalid path."));
return (GP_ERROR);
}
len = slash - dest_folder;
memset (dest_folder, 0, MAX_FOLDER_LEN);
strncpy (dest_folder, folder_orig,
MIN (MAX_FOLDER_LEN, MAX (len, 1)));
continue;
}
slash = strchr (rel_path, '/');
if (strcmp (rel_path, "") && (slash || !dest_filename)) {
/*
* We need to go down one folder. Append a
* trailing slash
*/
if (dest_folder[strlen (dest_folder) - 1] != '/')
strncat (dest_folder, "/", MAX_FOLDER_LEN);
}
if (slash) {
strncat (dest_folder, rel_path,
MIN (MAX_FOLDER_LEN, slash - rel_path));
rel_path = slash + 1;
} else {
} while (1);
strcpy(new_folder, tmp_folder);
return (GP_OK);
/* Done */
if (dest_filename)
strncpy (dest_filename, rel_path,
MAX_FILE_LEN);
else
strncat (dest_folder, rel_path, MAX_FILE_LEN);
break;
}
}
return (GP_OK);
}
int
shell_lcd (char *arg)
shell_lcd (const char *arg)
{
char tmp_dir[1024];
int arg_count = shell_arg_count(arg);
char new_cwd[MAX_FOLDER_LEN];
int arg_count = shell_arg_count (arg);
if (!arg_count) {
if (getenv("HOME")==NULL) {
cli_error_print("Could not find home directory");
return (GP_OK);
if (!getenv ("HOME")) {
cli_error_print (_("Could not find home directory."));
return (GP_OK);
}
strcpy(tmp_dir, getenv("HOME"));
} else {
/* shell_arg(arg, 0, arg_dir); */
shell_get_new_folder(glob_cwd, arg, tmp_dir);
}
strcpy (new_cwd, getenv ("HOME"));
} else
shell_construct_path (glob_cwd, arg, new_cwd, NULL);
if (chdir(tmp_dir)<0) {
cli_error_print("Could not change to local directory %s", tmp_dir);
if (chdir (new_cwd) < 0) {
cli_error_print (_("Could not change to "
"local directory '%s'."), new_cwd);
} else {
printf("Local directory now %s\n", tmp_dir);
strcpy(glob_cwd, tmp_dir);
printf (_("Local directory now '%s'."), new_cwd);
printf ("\n");
strcpy (glob_cwd, new_cwd);
}
return (GP_OK);
}
int
shell_cd (char *arg)
shell_cd (const char *arg)
{
char tmp_folder[1024];
char folder[MAX_FOLDER_LEN];
CameraList list;
int arg_count = shell_arg_count (arg);
int res;
@@ -221,48 +509,42 @@ shell_cd (char *arg)
}
/* Get the new folder value */
shell_get_new_folder (glob_folder, arg, tmp_folder);
printf("tmp_folder=%s\n", tmp_folder);
shell_construct_path (glob_folder, arg, folder, NULL);
res = gp_camera_folder_list_folders (glob_camera, tmp_folder, &list, glob_context);
if (res == GP_OK)
strcpy (glob_folder, tmp_folder);
else
cli_error_print ("Folder %s does not exist", tmp_folder);
res = gp_camera_folder_list_folders (glob_camera, folder, &list, glob_context);
if (res == GP_OK) {
strcpy (glob_folder, folder);
printf (_("Remote directory now '%s'."), glob_folder);
printf ("\n");
} else
cli_error_print ("Folder %s does not exist", folder);
return (GP_OK);
}
int
shell_ls (char *arg)
shell_ls (const char *arg)
{
CameraList list;
char buf[1024], tmp_folder[1024];
int x, y=1, res;
char buf[1024], folder[MAX_FOLDER_LEN];
int x, y=1;
int arg_count = shell_arg_count(arg);
const char *name;
if (arg_count) {
/* shell_arg(arg, 0, arg_dir); */
shell_get_new_folder (glob_folder, arg, tmp_folder);
shell_construct_path (glob_folder, arg, folder, NULL);
} else {
strcpy (tmp_folder, glob_folder);
strcpy (folder, glob_folder);
}
res = gp_camera_folder_list_folders (glob_camera, tmp_folder, &list, glob_context);
if (res != GP_OK) {
if (arg_count)
cli_error_print("Folder %s does not exist", tmp_folder);
else
cli_error_print("Could not retrieve the folder list");
return (res);
}
CHECK (gp_camera_folder_list_folders (glob_camera, folder, &list,
glob_context));
if (glob_quiet)
printf ("%i\n", gp_list_count(&list));
printf ("%i\n", gp_list_count (&list));
for (x = 1; x <= gp_list_count (&list); x++) {
gp_list_get_name (&list, x - 1, &name);
CHECK (gp_list_get_name (&list, x - 1, &name));
if (glob_quiet)
printf ("%s\n", name);
else {
@@ -273,9 +555,8 @@ shell_ls (char *arg)
}
}
res = gp_camera_folder_list_files (glob_camera, tmp_folder, &list, glob_context);
if (res != GP_OK)
return (res);
CHECK (gp_camera_folder_list_files (glob_camera, folder, &list,
glob_context));
if (glob_quiet)
printf("%i\n", gp_list_count(&list));
@@ -297,42 +578,25 @@ shell_ls (char *arg)
}
static int
shell_get_common (char *args, CameraFileType type)
shell_get_common (const char *args, CameraFileType type)
{
char tmp_folder[1024], arg[1024];
char *slash, *tmp_filename;
int x, arg_count = shell_arg_count (args);
char arg[1024];
unsigned int x;
char dest_folder[MAX_FOLDER_LEN], dest_filename[MAX_FILE_LEN];
if (!arg_count) {
cli_error_print("No filename specified");
return (GP_ERROR);
}
for (x = 0; x < shell_arg_count (args); x++) {
for (x = 0; x < arg_count; x++) {
shell_arg (args, x, arg);
if (strchr (arg, '/')) {
slash = strrchr (arg, '/');
tmp_filename = slash + 1;
*slash = 0;
if (strlen (arg)==0)
strcpy (tmp_folder, "/");
else
strcpy (tmp_folder, arg);
} else {
tmp_filename = arg;
strcpy (tmp_folder, glob_folder);
}
CHECK (save_file_to_file (tmp_folder, tmp_filename, type));
CHECK (shell_arg (args, x, arg));
CHECK (shell_construct_path (glob_folder, arg,
dest_folder, dest_filename));
CHECK (save_file_to_file (dest_folder, dest_filename, type));
}
return (GP_OK);
}
int
shell_get_thumbnail (char *arg)
shell_get_thumbnail (const char *arg)
{
CHECK (shell_get_common (arg, GP_FILE_TYPE_PREVIEW));
@@ -340,7 +604,7 @@ shell_get_thumbnail (char *arg)
}
int
shell_get (char *arg)
shell_get (const char *arg)
{
CHECK (shell_get_common (arg, GP_FILE_TYPE_NORMAL));
@@ -349,7 +613,7 @@ shell_get (char *arg)
}
int
shell_get_raw (char *arg)
shell_get_raw (const char *arg)
{
CHECK (shell_get_common (arg, GP_FILE_TYPE_RAW));
@@ -357,47 +621,124 @@ shell_get_raw (char *arg)
}
int
shell_exit (char *arg)
shell_del (const char *args)
{
char arg[1024];
unsigned int x;
char dest_folder[MAX_FOLDER_LEN], dest_filename[MAX_FILE_LEN];
for (x = 0; x < shell_arg_count (args); x++) {
CHECK (shell_arg (args, x, arg));
CHECK (shell_construct_path (glob_folder, arg,
dest_folder, dest_filename));
CHECK (gp_camera_file_delete (glob_camera, dest_folder,
dest_filename, glob_context));
}
return (GP_OK);
}
#ifdef HAVE_EXIF
static int
shell_show_exif (const char *arg)
{
char a[1024];
unsigned int x;
char dest_folder[MAX_FOLDER_LEN], dest_filename[MAX_FILE_LEN];
for (x = 0; x < shell_arg_count (arg); x++) {
CHECK (shell_arg (arg, x, a));
CHECK (shell_construct_path (glob_folder, a,
dest_folder, dest_filename));
CHECK (print_exif_action (dest_folder, dest_filename));
}
return (GP_OK);
}
#endif
static int
shell_show_info (const char *arg)
{
char a[1024];
unsigned int x;
char dest_folder[MAX_FOLDER_LEN], dest_filename[MAX_FILE_LEN];
for (x = 0; x < shell_arg_count (arg); x++) {
CHECK (shell_arg (arg, x, a));
CHECK (shell_construct_path (glob_folder, a,
dest_folder, dest_filename));
CHECK (print_info_action (dest_folder, dest_filename));
}
return (GP_OK);
}
int
shell_exit (const char *arg)
{
shell_done = 1;
return (GP_OK);
}
int
shell_help (char *arg)
static int
shell_help_command (const char *arg)
{
char arg_cmd[1024];
int x=0;
int arg_count = shell_arg_count (arg);
unsigned int x;
if (arg_count > 0) {
shell_arg(arg, 0, arg_cmd);
while (func[x].function) {
if (strcmp (arg_cmd, func[x].command) == 0) {
printf ("Help on \"%s\":\n\n", arg_cmd);
printf ("Usage: %s %s\n", arg_cmd,
func[x].description_arg);
printf ("Description: \n\t%s\n\n",
func[x].description);
printf ("* Arguments in brackets [] are "
"optional\n");
return (GP_OK);
}
x++;
}
cli_error_print ("Command not found in 'help'");
shell_arg (arg, 0, arg_cmd);
/* Search this command */
for (x = 0; func[x].function; x++)
if (!strcmp (arg_cmd, func[x].command))
break;
if (!func[x].function) {
printf (_("Command '%s' not found. Use 'help' to get a "
"list of available commands."), arg_cmd);
printf ("\n");
return (GP_OK);
}
printf ("Available commands:\n");
/* Print the command's syntax. */
printf (_("Help on \"%s\":"), func[x].command);
printf ("\n\n");
printf (_("Usage:"));
printf (" %s %s", func[x].command,
func[x].description_arg ? _(func[x].description_arg) : "");
printf ("\n");
printf (_("Description:"));
printf ("\n\t%s\n\n", _(func[x].description));
printf (_("* Arguments in brackets [] are optional"));
printf ("\n");
return (GP_OK);
}
while (func[x].function) {
printf ("\t%-16s%s\n", func[x].command, func[x].description);
x++;
static int
shell_help (const char *arg)
{
unsigned int x;
int arg_count = shell_arg_count (arg);
/*
* If help on a command is requested, print the syntax of the command.
*/
if (arg_count > 0) {
CHECK (shell_help_command (arg));
return (GP_OK);
}
printf ("\nTo get help on a particular command, type in "
"'help command-name'\n\n");
/* No command specified. Print command listing. */
printf (_("Available commands:"));
printf ("\n");
for (x = 0; func[x].function; x++)
printf ("\t%-16s%s\n", func[x].command, _(func[x].description));
printf ("\n");
printf (_("To get help on a particular command, type in "
"'help command-name'."));
printf ("\n\n");
return (GP_OK);
}

View File

@@ -1,18 +1,26 @@
typedef int (*shell_function_call) (char *arg);
typedef struct {
char command[16];
shell_function_call function;
char description[64];
char description_arg[64];
} shell_function;
/* shell.h
*
* Copyright (C) 2002 Lutz Müller <lutz@users.sourceforge.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef __SHELL_H__
#define __SHELL_H__
int shell_prompt (void);
int shell_cd (char *arg);
int shell_lcd (char *arg);
int shell_ls (char *arg);
int shell_get (char *arg);
int shell_get_thumbnail (char *arg);
int shell_get_raw (char *arg);
int shell_exit (char *arg);
int shell_help (char *arg);
#endif /* __SHELL_H__ */