/*
Bacula® - The Network Backup Solution
- Copyright (C) 2007-2009 Free Software Foundation Europe e.V.
+ Copyright (C) 2007-2010 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.
Switzerland, email:ftf@fsfeurope.org.
*/
/*
- * Version $Id$
- *
* Console Class
*
* Kern Sibbald, January MMVII
#include "select.h"
#include "run/run.h"
-Console::Console(QStackedWidget *parent)
+Console::Console(QTabWidget *parent)
{
QFont font;
+ m_name = tr("Console");
m_messages_pending = false;
m_parent = parent;
m_closeable = false;
m_console = this;
+ m_warningPrevent = false;
m_dircommCounter = 0;
+
+ /*
+ * Create a connection to the Director and put it in a hash table
+ */
m_dircommHash.insert(m_dircommCounter, new DirComm(this, m_dircommCounter));
setupUi(this);
return;
DirComm *dircomm = m_dircommHash.value(conn);
- if (mainWin->m_checkMessages && dircomm->m_at_main_prompt && hasFocus()){
+ if (mainWin->m_checkMessages && dircomm->m_at_main_prompt && hasFocus() && !mainWin->getWaitState()){
messagesPending(true);
dircomm->write(".messages");
displayToPrompt(conn);
* A function created to separate out the population of the lists
* from the Console::connect_dir function
*/
-void Console::populateLists(bool forcenew)
+void Console::populateLists(bool /*forcenew*/)
{
int conn;
- if (forcenew) {
- if (!newDirComm(conn)) {
- Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name());
- return;
- }
- } else {
- if(!availableDirComm(conn)) {
- Pmsg1(000, "availableDirComm Seems to Failed to find a connection for populateListsi %s\n", m_dir->name());
- return;
- }
+ if (!availableDirComm(conn) && !newDirComm(conn)) {
+ Emsg1(M_ABORT, 0, "Failed to connect to %s for populateLists.\n", m_dir->name());
+ return;
}
populateLists(conn);
}
job_list.clear();
client_list.clear();
fileset_list.clear();
- fileset_list.clear();
messages_list.clear();
pool_list.clear();
storage_list.clear();
type_list.clear();
level_list.clear();
+ volstatus_list.clear();
+ mediatype_list.clear();
dir_cmd(conn, ".jobs", job_list);
dir_cmd(conn, ".clients", client_list);
dir_cmd(conn, ".filesets", fileset_list);
dir_cmd(conn, ".storage", storage_list);
dir_cmd(conn, ".types", type_list);
dir_cmd(conn, ".levels", level_list);
+ dir_cmd(conn, ".volstatus", volstatus_list);
+ dir_cmd(conn, ".mediatypes", mediatype_list);
+ dir_cmd(conn, ".locations", location_list);
if (mainWin->m_connDebug) {
QString dbgmsg = QString("jobs=%1 clients=%2 filesets=%3 msgs=%4 pools=%5 storage=%6 types=%7 levels=%8 conn=%9 %10\n")
.arg(conn).arg(m_dir->name());
Pmsg1(000, "%s", dbgmsg.toUtf8().data());
}
+ job_list.sort();
+ client_list.sort();
+ fileset_list.sort();
+ messages_list.sort();
+ pool_list.sort();
+ storage_list.sort();
+ type_list.sort();
+ level_list.sort();
}
/*
dir_cmd(conn, cmd, results);
return true;
} else {
- Pmsg1(000, "dir_cmd Seems to Failed to find a connection %s\n", m_dir->name());
+ Pmsg1(000, "dir_cmd failed to connect to %s\n", m_dir->name());
return false;
}
}
return true; /* ***FIXME*** return any command error */
}
-/* Send a command to the Director */
+/*
+ * Overloads for
+ * Sending a command to the Director
+ */
int Console::write_dir(const char *msg)
{
int conn;
return conn;
}
-/* Send a command to the Director */
+int Console::write_dir(const char *msg, bool dowait)
+{
+ int conn;
+ if (availableDirComm(conn))
+ write_dir(conn, msg, dowait);
+ return conn;
+}
+
void Console::write_dir(int conn, const char *msg)
+{
+ write_dir(conn, msg, true);
+}
+
+/*
+ * Send a command to the Director
+ */
+void Console::write_dir(int conn, const char *msg, bool dowait)
{
DirComm *dircomm = m_dircommHash.value(conn);
if (dircomm->m_sock) {
mainWin->set_status(_("Processing command ..."));
- mainWin->waitEnter();
+ if (dowait)
+ mainWin->waitEnter();
dircomm->write(msg);
- mainWin->waitExit();
+ if (dowait)
+ mainWin->waitExit();
} else {
mainWin->set_status( tr(" Director not connected. Click on connect button."));
mainWin->actionConnect->setIcon(QIcon(":images/disconnected.png"));
/* Position cursor to end of screen */
void Console::update_cursor()
{
-// QApplication::restoreOverrideCursor();
m_textEdit->moveCursor(QTextCursor::End);
m_textEdit->ensureCursorVisible();
}
if (mainWin->m_commDebug) Pmsg2(000, "endDiscardToPrompt=%d %s\n", stat, m_dir->name());
}
+QString Console::returnFromPrompt(int conn)
+{
+ DirComm *dircomm = m_dircommHash.value(conn);
+ QString text("");
+
+ int stat = 0;
+ text = "";
+ if (mainWin->m_commDebug) Pmsg1(000, "returnFromPrompt %s\n", m_dir->name());
+ while (!dircomm->m_at_prompt) {
+ if ((stat=dircomm->read()) > 0) {
+ text += dircomm->msg();
+ }
+ }
+ if (mainWin->m_commDebug) Pmsg2(000, "endreturnFromPrompt=%d %s\n", stat, m_dir->name());
+ return text;
+}
+
/*
* When the notifier is enabled, read_dir() will automatically be
* called by the Qt event loop when ever there is any output
- * from the Directory, and read_dir() will then display it on
+ * from the Director, and read_dir() will then display it on
* the console.
*
* When we are in a bat dialog, we want to control *all* output
- * from the Directory, so we set notify to off.
+ * from the Director, so we set notify to off.
* m_console->notifiy(false);
*/
* This may be rendered not needed if the multiple connections feature gets working */
bool Console::hasFocus()
{
- if (mainWin->stackedWidget->currentIndex() == mainWin->stackedWidget->indexOf(this))
+ if (mainWin->tabWidget->currentIndex() == mainWin->tabWidget->indexOf(this))
return true;
else
return false;
return false;
}
+
+/*
+ * Need current connection.
+ */
+bool Console::currentDirComm(int &conn)
+{
+ QHash<int, DirComm*>::const_iterator iter = m_dircommHash.constBegin();
+ while (iter != m_dircommHash.constEnd()) {
+ DirComm *dircomm = iter.value();
+ if (dircomm->m_at_prompt && !dircomm->m_at_main_prompt && dircomm->is_notify_enabled()) {
+ conn = dircomm->m_conn;
+ return true;
+ }
+ ++iter;
+ }
+ return false;
+}
+
/*
* Create a new connection
*/
projects / bacula / bacula / blobdiff