From 89c637750ccca48fecf0557d8b325694d68aed89 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Thu, 14 May 2009 15:02:23 +0000 Subject: [PATCH] kes Reduce bconsole help to fit in 80 columns kes Add bconsole @help command kes Fix Show FileSet command to handle spaces git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8827 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/console/console.c | 17 +++++++-- bacula/src/dird/ua_cmds.c | 45 +++++++++++++++-------- bacula/src/qt-console/fileset/fileset.cpp | 8 ++-- bacula/src/qt-console/fileset/fileset.h | 4 +- bacula/src/qt-console/fileset/fileset.ui | 2 +- bacula/technotes | 3 ++ 6 files changed, 53 insertions(+), 26 deletions(-) diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c index 6098e92ad4..a99c028169 100644 --- a/bacula/src/console/console.c +++ b/bacula/src/console/console.c @@ -101,6 +101,7 @@ static int inputcmd(FILE *input, BSOCK *UA_sock); static int outputcmd(FILE *input, BSOCK *UA_sock); static int teecmd(FILE *input, BSOCK *UA_sock); static int quitcmd(FILE *input, BSOCK *UA_sock); +static int helpcmd(FILE *input, BSOCK *UA_sock); static int echocmd(FILE *input, BSOCK *UA_sock); static int timecmd(FILE *input, BSOCK *UA_sock); static int sleepcmd(FILE *input, BSOCK *UA_sock); @@ -176,11 +177,12 @@ static struct cmdstruct commands[] = { { N_("exec"), execcmd, _("execute an external command")}, { N_("exit"), quitcmd, _("exit = quit")}, { N_("zed_keys"), zed_keyscmd, _("zed_keys = use zed keys instead of bash keys")}, + { N_("help"), helpcmd, _("help listing")}, #ifdef HAVE_READLINE { N_("separator"), eolcmd, _("set command separator")}, #endif }; -#define comsize (sizeof(commands)/sizeof(struct cmdstruct)) +#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct))) static int do_a_command(FILE *input, BSOCK *UA_sock) { @@ -1068,8 +1070,7 @@ static int execcmd(FILE *input, BSOCK *UA_sock) static int echocmd(FILE *input, BSOCK *UA_sock) { for (int i=1; i < argc; i++) { - senditf("%s", argk[i]); - sendit(" "); + senditf("%s ", argk[i]); } sendit("\n"); return 1; @@ -1080,6 +1081,16 @@ static int quitcmd(FILE *input, BSOCK *UA_sock) return 0; } +static int helpcmd(FILE *input, BSOCK *UA_sock) +{ + int i; + for (i=0; i 1) { diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index c9f10d6445..ca513b6458 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -112,10 +112,12 @@ int quit_cmd(UAContext *ua, const char *cmd); to prevent breakage of existing user scripts. */ struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; const bool use_in_rs;}; static struct cmdstruct commands[] = { /* Can use it in Console RunScript*/ - { NT_("add"), add_cmd, _("add [pool= storage= jobid=] -- add media to a pool"), false}, + { NT_("add"), add_cmd, _("add [pool= storage= jobid=] -- " + "\n add media to a pool"), false}, { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages"),false}, { NT_("automount"), automount_cmd, _("automount [on|off] -- after label"), false}, - { NT_("cancel"), cancel_cmd, _("cancel [jobid= job= ujobid=] -- cancel a job"), false}, + { NT_("cancel"), cancel_cmd, _("cancel [jobid= job= ujobid=] -- " + "\n cancel a job"), false}, { NT_("create"), create_cmd, _("create [pool=] -- create DB Pool from resource"), false}, { NT_("delete"), delete_cmd, _("delete [volume= pool= job jobid=]"), true}, { NT_("disable"), disable_cmd, _("disable -- disable a job"), true}, @@ -125,44 +127,55 @@ static struct cmdstruct commands[] = { /* C { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode"), false}, { NT_("help"), help_cmd, _("print this command"), false}, { NT_("label"), label_cmd, _("label a tape"), false}, - { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files | copies ]; from catalog"), true}, + { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | " + "\n files | copies ]; from catalog"), true}, { NT_("llist"), llist_cmd, _("full or long list like list command"), true}, { NT_("messages"), messagescmd, _("messages"), false}, { NT_("memory"), memory_cmd, _("print current memory usage"), true}, - { NT_("mount"), mount_cmd, _("mount storage= [ slot= ] [ drive= ] or mount [ jobid= | job= ]"), false}, - { NT_("prune"), prunecmd, _("prune files|jobs|volume client= volume= prune expired records from catalog"), true}, + { NT_("mount"), mount_cmd, _("mount storage= [ slot= ] [ drive= ] " + "\n or mount [ jobid= | job= ]"), false}, + { NT_("prune"), prunecmd, _("prune files|jobs|volume client= volume= " + "\n prune expired records from catalog"), true}, { NT_("purge"), purgecmd, _("purge records from catalog"), true}, { NT_("python"), python_cmd, _("python control commands"), false}, { NT_("quit"), quit_cmd, _("quit"), false}, { NT_("query"), querycmd, _("query catalog"), false}, { NT_("restore"), restore_cmd, _("restore files"), false}, - { NT_("relabel"), relabel_cmd, _("relabel storage= oldvolume= volume= -- relabel a tape"), false}, + { NT_("relabel"), relabel_cmd, _("relabel storage= oldvolume= " + "\n volume= -- relabel a tape"), false}, { NT_("release"), release_cmd, _("release "), false}, { NT_("reload"), reload_cmd, _("reload conf file"), true}, - { NT_("run"), run_cmd, _("run job= client= fileset= level= storage= where= when= yes"), false}, /* need to be check */ - { NT_("status"), status_cmd, _("status [all | dir= | director | client= | storage= | days=nnn]"), true}, - { NT_("setdebug"), setdebug_cmd, _("setdebug level=nn [trace=0/1 client= | dir | director | storage= | all] -- sets debug level"), true}, + { NT_("run"), run_cmd, _("run job= client= fileset= " + "\n level= storage= where= " + "\n when= yes"), false}, /* need to be check */ + { NT_("status"), status_cmd, _("status [all | dir= | director | client= |" + "\n storage= | days=nnn]"), true}, + { NT_("setdebug"), setdebug_cmd, _("setdebug level=nn [trace=0/1 client= |" + "\n dir | director | storage= | all] -- sets debug level"), true}, { NT_("setip"), setip_cmd, _("sets new client address -- if authorized"), false}, { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]"), true}, { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog"), false}, { NT_("time"), time_cmd, _("print current time"), true}, { NT_("trace"), trace_cmd, _("turn on/off trace to file"), true}, - { NT_("unmount"), unmount_cmd, _("unmount storage= [ drive= ] or unmount [ jobid= | job= ]"), false}, + { NT_("unmount"), unmount_cmd, _("unmount storage= [ drive= ] " + "\n or unmount [ jobid= | job= ]"), false}, { NT_("umount"), unmount_cmd, _("umount - for old-time Unix guys, see unmount"),false}, { NT_("update"), update_cmd, _("update Volume, Pool or slots"), true}, { NT_("use"), use_cmd, _("use -- catalog xxx"), false}, { NT_("var"), var_cmd, _("does variable expansion"), false}, { NT_("version"), version_cmd, _("print Director version"), true}, - { NT_("wait"), wait_cmd, _("wait [ | | ] -- wait until no jobs are running"), false}, - }; -#define comsize (sizeof(commands)/sizeof(struct cmdstruct)) + { NT_("wait"), wait_cmd, _("wait [ | | ] -- " + "\n wait until no jobs are running"), false} +}; + +#define comsize ((int)(sizeof(commands)/sizeof(struct cmdstruct))) /* * Execute a command from the UA */ bool do_a_command(UAContext *ua) { - unsigned int i; + int i; int len; bool ok = false; bool found = false; @@ -1805,7 +1818,7 @@ int wait_cmd(UAContext *ua, const char *cmd) static int help_cmd(UAContext *ua, const char *cmd) { - unsigned int i; + int i; ua->send_msg(_(" Command Description\n ======= ===========\n")); for (i=0; isend_msg("%s %s\n", commands[i].key, _(commands[i].help)); diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp index 108eae991c..6a8d71609c 100644 --- a/bacula/src/qt-console/fileset/fileset.cpp +++ b/bacula/src/qt-console/fileset/fileset.cpp @@ -218,7 +218,7 @@ void FileSet::createContextMenu() connect(actionRefreshFileSet, SIGNAL(triggered()), this, SLOT(populateTable())); connect(actionStatusFileSetInConsole, SIGNAL(triggered()), this, - SLOT(consoleStatusFileSet())); + SLOT(consoleShowFileSet())); connect(actionShowJobs, SIGNAL(triggered()), this, SLOT(showJobs())); } @@ -227,10 +227,10 @@ void FileSet::createContextMenu() * Function responding to actionListJobsofFileSet which calls mainwin function * to create a window of a list of jobs of this fileset. */ -void FileSet::consoleStatusFileSet() +void FileSet::consoleShowFileSet() { - QString cmd("status fileset="); - cmd += m_currentlyselected; + QString cmd("show fileset=\""); + cmd += m_currentlyselected + "\""; consoleCommand(cmd); } diff --git a/bacula/src/qt-console/fileset/fileset.h b/bacula/src/qt-console/fileset/fileset.h index 8973c3405e..b9525bf738 100644 --- a/bacula/src/qt-console/fileset/fileset.h +++ b/bacula/src/qt-console/fileset/fileset.h @@ -3,7 +3,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2007 Free Software Foundation Europe e.V. + Copyright (C) 2007-2009 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -53,7 +53,7 @@ public slots: private slots: void populateTable(); - void consoleStatusFileSet(); + void consoleShowFileSet(); void showJobs(); private: diff --git a/bacula/src/qt-console/fileset/fileset.ui b/bacula/src/qt-console/fileset/fileset.ui index eca3b9d0ef..f08e06b9af 100644 --- a/bacula/src/qt-console/fileset/fileset.ui +++ b/bacula/src/qt-console/fileset/fileset.ui @@ -33,7 +33,7 @@ :/images/status-console.png - Status FileSet In Console + Show FileSet In Console diff --git a/bacula/technotes b/bacula/technotes index 0c8b08f5cd..303fa4ed8b 100644 --- a/bacula/technotes +++ b/bacula/technotes @@ -3,6 +3,9 @@ General: 14May09 +kes Reduce bconsole help to fit in 80 columns +kes Add bconsole @help command +kes Fix Show FileSet command to handle spaces kes Allow specification of base daemon resource name. --with-basename= kes Fix bat to automatically use installed bat.conf -- 2.39.5