Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+// http://66.102.9.104/search?q=cache:Djc1mPF3hRoJ:cvs.sourceforge.net/viewcvs.py/audacity/audacity-src/src/AudioIO.cpp%3Frev%3D1.102+macos+x+wxthread&hl=fr
+
#include "console_thread.h" // class's header file
#include <wx/wxprec.h>
#include <wx/thread.h>
+#include <wx/file.h>
#include <bacula.h>
#include <jcr.h>
/* Imported functions */
int authenticate_director(JCR *jcr, DIRRES *director, CONRES *cons);
-// class constructor
-console_thread::console_thread(wxString configfile) {
- UA_sock = NULL;
- this->configfile = configfile;
-}
+bool console_thread::inited = false;
+bool console_thread::configloaded = false;
-// class destructor
-console_thread::~console_thread() {
- if (UA_sock) {
- bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
- bnet_close(UA_sock);
- UA_sock = NULL;
- }
- if (WSACleanup() == 0) {
- //csprint("Windows sockets cleaned up successfully...\n");
- }
- else {
- csprint("Error while cleaning up windows sockets...\n");
- }
-}
-
-/*
- * Thread entry point
- */
-void* console_thread::Entry() {
- if (WSA_Init() == 0) {
- //csprint("Windows sockets initialized successfully...\n");
- }
- else {
+void console_thread::InitLib() {
+ if (WSA_Init() != 0) {
csprint("Error while initializing windows sockets...\n");
+ inited = false;
+ return;
}
-
- csprint("Connecting...\n");
-
+
init_stack_dump();
my_name_is(0, NULL, "wx-console");
//textdomain("bacula-console");
+ inited = true;
+}
+
+void console_thread::FreeLib() {
+ if (inited) {
+ if (WSACleanup() != 0) {
+ csprint("Error while cleaning up windows sockets...\n");
+ }
+ }
+}
+
+wxString console_thread::LoadConfig(wxString configfile) {
+ if (!inited) {
+ InitLib();
+ if (!inited)
+ return "Error while initializing library.";
+ }
+
MSGS* msgs = (MSGS *)malloc(sizeof(MSGS));
memset(msgs, 0, sizeof(MSGS));
for (int i=1; i<=M_MAX; i++) {
/* TODO (#4#): Allow the user to choose his config file. */
if (!parse_config(configfile.c_str(), 0)) {
- csprint("Unable to read configuration file.\n");
+ configloaded = false;
+ wxFile file("./wx-console.conmsg");
+ if (!file.IsOpened())
+ return "Unable to retrieve error message.";
+ wxString err = "";
+ wxChar buffer[513];
+ off_t len;
+ while ((len = file.Read(buffer, 512)) > -1) {
+ buffer[len] = (wxChar)0;
+ err += buffer;
+ if (file.Eof())
+ break;
+ }
+ file.Close();
+ term_msg();
+ wxRemoveFile("./wx-console.conmsg");
+ return err;
+ }
+
+ term_msg();
+ wxRemoveFile("./wx-console.conmsg");
+ init_msg(NULL, NULL);
+
+ configloaded = true;
+
+ return "";
+}
+
+// class constructor
+console_thread::console_thread() {
+ UA_sock = NULL;
+}
+
+// class destructor
+console_thread::~console_thread() {
+ if (UA_sock) {
+ bnet_sig(UA_sock, BNET_TERMINATE); /* send EOF */
+ bnet_close(UA_sock);
+ UA_sock = NULL;
+ }
+}
+
+/*
+ * Thread entry point
+ */
+void* console_thread::Entry() {
+ if (!inited) {
+ csprint("Error : Library not initialized\n");
csprint(NULL, CS_END);
csprint(NULL, CS_DISCONNECTED);
csprint(NULL, CS_TERMINATED);
return NULL;
}
- init_msg(NULL, NULL);
+ if (!configloaded) {
+ csprint("Error : No configuration file loaded\n");
+ csprint(NULL, CS_END);
+ csprint(NULL, CS_DISCONNECTED);
+ csprint(NULL, CS_TERMINATED);
+ #ifdef HAVE_WIN32
+ Exit();
+ #endif
+ return NULL;
+ }
+ csprint("Connecting...\n");
+
LockRes();
DIRRES *dir = (DIRRES *)GetNextRes(R_DIRECTOR, NULL);
UnlockRes();
#include "wxbrestorepanel.h"
+#include "wxbconfigfileeditor.h"
+
#include "csprint.h"
#include "wxwin16x16.xpm"
#include <wx/stattext.h>
+#include <wx/config.h>
+
+#include <wx/filename.h>
+
// ----------------------------------------------------------------------------
// event tables and other macros for wxWindows
// ----------------------------------------------------------------------------
// this standard value as otherwise it won't be handled properly under Mac
// (where it is special and put into the "Apple" menu)
Minimal_About = wxID_ABOUT,
- TypeText = 2,
- SendButton = 3,
- Thread = 4
+
+ ChangeConfigFile = 2,
+ EditConfigFile = 3,
+ MenuConnect = 4,
+ MenuDisconnect = 5,
+ TypeText = 6,
+ SendButton = 7,
+ Thread = 8
};
/*
BEGIN_EVENT_TABLE(wxbMainFrame, wxFrame)
EVT_MENU(Minimal_Quit, wxbMainFrame::OnQuit)
EVT_MENU(Minimal_About, wxbMainFrame::OnAbout)
+ EVT_MENU(ChangeConfigFile, wxbMainFrame::OnChangeConfig)
+ EVT_MENU(EditConfigFile, wxbMainFrame::OnEditConfig)
+ EVT_MENU(MenuConnect, wxbMainFrame::OnConnect)
+ EVT_MENU(MenuDisconnect, wxbMainFrame::OnDisconnect)
EVT_TEXT_ENTER(TypeText, wxbMainFrame::OnEnter)
EVT_THREAD_EVENT(Thread, wxbMainFrame::OnPrint)
EVT_BUTTON(SendButton, wxbMainFrame::OnEnter)
: wxFrame(NULL, -1, title, pos, size, style)
{
ct = NULL;
+
+ promptparser = NULL;
// set the frame icon
SetIcon(wxIcon(wxwin16x16_xpm));
#if wxUSE_MENUS
// create a menu bar
- wxMenu *menuFile = new wxMenu;
+ menuFile = new wxMenu;
// the "About" item should be in the help menu
wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Minimal_About, _T("&About...\tF1"), _T("Show about dialog"));
+ menuFile->Append(MenuConnect, _T("Connect"), _T("Connect to the director"));
+ menuFile->Append(MenuDisconnect, _T("Disconnect"), _T("Disconnect of the director"));
+ menuFile->AppendSeparator();
+ menuFile->Append(ChangeConfigFile, _T("Change of configuration file"), _T("Change your default configuration file"));
+ menuFile->Append(EditConfigFile, _T("Edit your configuration file"), _T("Edit your configuration file"));
+ menuFile->AppendSeparator();
menuFile->Append(Minimal_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar...
/*
* Starts the thread interacting with the director
+ * If config is not empty, uses this config file.
*/
-void wxbMainFrame::StartConsoleThread()
-{
+void wxbMainFrame::StartConsoleThread(const wxString& config) {
+ menuFile->Enable(MenuConnect, false);
+ menuFile->Enable(MenuDisconnect, false);
+ menuFile->Enable(ChangeConfigFile, false);
+ menuFile->Enable(EditConfigFile, false);
+
if (ct != NULL) {
ct->Delete();
+ ct = NULL;
}
- else {
+ if (promptparser == NULL) {
promptparser = new wxbPromptParser();
}
wxString configfile;
+
+ if (config == "") {
+ if ((wxTheApp->argc == 3) && (wxString(wxTheApp->argv[1]) == "-c")) {
+ configfile = wxTheApp->argv[2];
+ }
+ else {
+ wxConfig::Set(new wxConfig("wx-console", "bacula"));
+ if (!wxConfig::Get()->Read("/ConfigFile", &configfile)) {
+#ifdef HAVE_MACOSX
+ wxFileName filename(::wxGetHomeDir());
+ filename.MakeAbsolute();
+ configfile = filename.GetLongPath();
+ if (configfile.Last() != '/')
+ configfile += '/';
+ configfile += "Library/Preferences/org.bacula.wxconsole.conf";
+#else
+ wxFileName filename(::wxGetCwd(), "wx-console.conf");
+ filename.MakeAbsolute();
+ configfile = filename.GetLongPath();
+#ifdef HAVE_WIN32
+ configfile.Replace("\\", "/");
+#endif //HAVE_WIN32
+#endif //HAVE_MACOSX
+ wxConfig::Get()->Write("/ConfigFile", configfile);
+ if (wxTheApp->argc > 1) {
+ Print("Error while parsing command line arguments, using defaults.\n", CS_DEBUG);
+ Print("Usage: wx-console [-c configfile]\n", CS_DEBUG);
+ }
-
- if ((wxTheApp->argc == 3) && (wxString(wxTheApp->argv[1]) == "-c")) {
- configfile = wxTheApp->argv[2];
+ int answer = wxMessageBox(
+ wxString("It seems that it is the first time you run wx-console.\n") <<
+ "This file (" << configfile << ") has been choosen as default configuration file.\n" <<
+ "Do you want to edit it? (if you click No you will have to select another file)",
+ "First run",
+ wxYES_NO | wxICON_QUESTION, this);
+ if (answer == wxYES) {
+ wxbConfigFileEditor(this, configfile).ShowModal();
+ }
+ }
+ }
}
else {
-#ifdef HAVE_MACOSX
- configfile = "/Library/Preferences/org.bacula.wxconsole.conf";
-#else
- configfile = "./wx-console.conf";
-#endif
- if (wxTheApp->argc > 1) {
- Print("Error while parsing command line arguments, using defaults.\n", CS_DEBUG);
- Print("Usage: wx-console [-c configfile]\n", CS_DEBUG);
+ configfile = config;
+ }
+
+ wxString err = console_thread::LoadConfig(configfile);
+
+ while (err != "") {
+ int answer = wxMessageBox(
+ wxString("Unable to read ") << configfile << "\n" <<
+ err << "\nDo you want to choose another one? (Press no to edit this file)",
+ "Unable to read configuration file",
+ wxYES_NO | wxCANCEL | wxICON_ERROR, this);
+ if (answer == wxNO) {
+ wxbConfigFileEditor(this, configfile).ShowModal();
+ err = console_thread::LoadConfig(configfile);
+ }
+ else if (answer == wxCANCEL) {
+ frame = NULL;
+ Close(true);
+ return;
+ }
+ else { // (answer == wxYES)
+ configfile = wxFileSelector("Please choose a configuration file to use");
+ if ( !configfile.empty() ) {
+ err = console_thread::LoadConfig(configfile);
+ }
+ else {
+ frame = NULL;
+ Close(true);
+ return;
+ }
+ }
+
+ if ((err == "") && (config == "")) {
+ answer = wxMessageBox(
+ "This configuration file has been successfully read, use it as default?",
+ "Configuration file read successfully",
+ wxYES_NO | wxICON_QUESTION, this);
+ if (answer == wxYES) {
+ wxConfigBase::Get()->Write("/ConfigFile", configfile);
+ }
+ break;
}
}
- ct = new console_thread(configfile);
+ csprint(wxString("Using this configuration file: ") << configfile << "\n", CS_DEBUG);
+
+ ct = new console_thread();
ct->Create();
ct->Run();
SetStatusText("Connecting to the director...");
ct->Delete();
ct = NULL;
}
+ console_thread::FreeLib();
frame = NULL;
Close(TRUE);
}
wxMessageBox(msg, _T("About Bacula wx-console"), wxOK | wxICON_INFORMATION, this);
}
+void wxbMainFrame::OnChangeConfig(wxCommandEvent& event) {
+ wxString oriconfigfile;
+ wxConfig::Get()->Read("/ConfigFile", &oriconfigfile);
+ wxString configfile = wxFileSelector("Please choose your default configuration file");
+ if ( !configfile.empty() ) {
+ if (oriconfigfile != configfile) {
+ int answer = wxMessageBox(
+ "Use this configuration file as default?",
+ "Configuration file",
+ wxYES_NO | wxICON_QUESTION, this);
+ if (answer == wxYES) {
+ wxConfigBase::Get()->Write("/ConfigFile", configfile);
+ StartConsoleThread("");
+ return;
+ }
+ }
+
+ StartConsoleThread(configfile);
+ }
+}
+
+void wxbMainFrame::OnEditConfig(wxCommandEvent& event) {
+ wxString configfile;
+ wxConfig::Get()->Read("/ConfigFile", &configfile);
+ int stat = wxbConfigFileEditor(this, configfile).ShowModal();
+ if (stat == wxOK) {
+ StartConsoleThread(configfile);
+ }
+}
+
+void wxbMainFrame::OnConnect(wxCommandEvent& event) {
+ menuFile->Enable(MenuConnect, false);
+ menuFile->Enable(MenuDisconnect, false);
+ menuFile->Enable(ChangeConfigFile, false);
+ menuFile->Enable(EditConfigFile, false);
+
+ if (ct != NULL) {
+ ct->Delete();
+ ct = NULL;
+ }
+ if (promptparser == NULL) {
+ promptparser = new wxbPromptParser();
+ }
+
+ ct = new console_thread();
+ ct->Create();
+ ct->Run();
+ SetStatusText("Connecting to the director...");
+}
+
+void wxbMainFrame::OnDisconnect(wxCommandEvent& event) {
+ if (ct != NULL) {
+ ct->Delete();
+ ct = NULL;
+ }
+}
+
void wxbMainFrame::OnEnter(wxCommandEvent& WXUNUSED(event))
{
lockedbyconsole = true;
frame = NULL;
Close(true);
}
+ menuFile->Enable(MenuConnect, true);
+ menuFile->SetLabel(MenuConnect, "Connect");
+ menuFile->SetHelpString(MenuConnect, "Connect to the director");
+ menuFile->Enable(MenuDisconnect, false);
+ menuFile->Enable(ChangeConfigFile, true);
+ menuFile->Enable(EditConfigFile, true);
return;
}
if (status == CS_CONNECTED) {
SetStatusText("Connected to the director.");
EnablePanels();
+ menuFile->Enable(MenuConnect, true);
+ menuFile->SetLabel(MenuConnect, "Reconnect");
+ menuFile->SetHelpString(MenuConnect, "Reconnect to the director");
+ menuFile->Enable(MenuDisconnect, false);
+ menuFile->Enable(ChangeConfigFile, true);
+ menuFile->Enable(EditConfigFile, true);
return;
}
if (status == CS_DISCONNECTED) {
projects / bacula / bacula / commitdiff