*/
/* Note concerning "done" output (modifiable marked with +)
Run Restore job
-JobName: RestoreFiles
++JobName: RestoreFiles
Bootstrap: /var/lib/bacula/restore.bsr
+Where: /tmp/bacula-restores
+Replace: always
-FileSet: Full Set
-Client: tom-fd
-Storage: File
++FileSet: Full Set
++Client: tom-fd
++Storage: File
+When: 2004-04-18 01:18:56
+Priority: 10
OK to run? (yes/mod/no):mod
1: Level (not appropriate)
2: Storage (automatic ?)
3: Job (no)
- 4: FileSet (no)
+ 4: FileSet (yes)
5: Client (yes : "The defined Client resources are:\n\t1: velours-fd\n\t2: tom-fd\nSelect Client (File daemon) resource (1-2):")
6: When (yes : "Please enter desired start time as YYYY-MM-DD HH:MM:SS (return for now):")
7: Priority (yes : "Enter new Priority: (positive integer)")
#include "marked.xpm"
#include "partmarked.xpm"
+#include <wx/listimpl.cpp>
+
/* A macro named Yield is defined under MinGW */
#undef Yield
+WX_DEFINE_LIST(wxbEventList);
+
/*
* Class which is stored in the tree and in the list to keep informations
* about the element.
ConfigFileset = 13,
ConfigStorage = 14,
ConfigJobName = 15,
- ConfigPool = 16
+ ConfigPool = 16,
+ TreeAdd = 17,
+ TreeRemove = 18,
+ TreeRefresh = 19,
+ ListAdd = 20,
+ ListRemove = 21,
+ ListRefresh = 22
};
BEGIN_EVENT_TABLE(wxbRestorePanel, wxPanel)
EVT_TREE_SEL_CHANGING(TreeCtrl, wxbRestorePanel::OnTreeChanging)
EVT_TREE_SEL_CHANGED(TreeCtrl, wxbRestorePanel::OnTreeChanged)
EVT_TREE_ITEM_EXPANDING(TreeCtrl, wxbRestorePanel::OnTreeExpanding)
+ EVT_TREE_MARKED_EVENT(TreeCtrl, wxbRestorePanel::OnTreeMarked)
+ EVT_BUTTON(TreeAdd, wxbRestorePanel::OnTreeAdd)
+ EVT_BUTTON(TreeRemove, wxbRestorePanel::OnTreeRemove)
+ EVT_BUTTON(TreeRefresh, wxbRestorePanel::OnTreeRefresh)
+
EVT_LIST_ITEM_ACTIVATED(ListCtrl, wxbRestorePanel::OnListActivated)
-
- /*EVT_TREE_MARKED_EVENT(wxID_ANY, wxbRestorePanel::OnTreeMarked)
- EVT_LIST_MARKED_EVENT(wxID_ANY, wxbRestorePanel::OnListMarked)*/
+ EVT_LIST_MARKED_EVENT(ListCtrl, wxbRestorePanel::OnListMarked)
+ EVT_LIST_ITEM_SELECTED(ListCtrl, wxbRestorePanel::OnListChanged)
+ EVT_LIST_ITEM_DESELECTED(ListCtrl, wxbRestorePanel::OnListChanged)
+ EVT_BUTTON(ListAdd, wxbRestorePanel::OnListAdd)
+ EVT_BUTTON(ListRemove, wxbRestorePanel::OnListRemove)
+ EVT_BUTTON(ListRefresh, wxbRestorePanel::OnListRefresh)
EVT_TEXT(ConfigWhere, wxbRestorePanel::OnConfigUpdated)
EVT_TEXT(ConfigWhen, wxbRestorePanel::OnConfigUpdated)
EVT_BUTTON(ConfigCancel, wxbRestorePanel::OnConfigCancel)
END_EVENT_TABLE()
-BEGIN_EVENT_TABLE(wxbTreeListPanel, wxPanel)
- EVT_TREE_MARKED_EVENT(wxID_ANY, wxbTreeListPanel::OnTreeMarked)
- EVT_LIST_MARKED_EVENT(wxID_ANY, wxbTreeListPanel::OnListMarked)
-END_EVENT_TABLE()
-
/*
* wxbRestorePanel constructor
*/
wxbRestorePanel::wxbRestorePanel(wxWindow* parent): wxbPanel(parent) {
+ //pendingEvents = new wxbEventList(); //EVTQUEUE
+ //processing = false; //EVTQUEUE
+ SetWorking(false);
+
imagelist = new wxImageList(16, 16, TRUE, 3);
imagelist->Add(wxIcon(unmarked_xpm));
imagelist->Add(wxIcon(marked_xpm));
mainSizer->Add(firstSizer, 1, wxEXPAND, 10);
- treelistPanel = new wxbTreeListPanel(this);
-
- wxFlexGridSizer* treelistSizer = new wxFlexGridSizer(1, 2, 10, 10);
+ treelistPanel = new wxSplitterWindow(this);
- tree = new wxbTreeCtrl(treelistPanel, TreeCtrl, wxDefaultPosition, wxSize(200,50));
- treelistSizer->Add(tree, 1, wxEXPAND, 10);
+ wxPanel* treePanel = new wxPanel(treelistPanel);
+ wxFlexGridSizer *treeSizer = new wxFlexGridSizer(2, 1, 0, 0);
+ treeSizer->AddGrowableCol(0);
+ treeSizer->AddGrowableRow(0);
+ tree = new wxbTreeCtrl(treePanel, this, TreeCtrl, wxDefaultPosition, wxSize(200,50));
tree->SetImageList(imagelist);
- list = new wxbListCtrl(treelistPanel, ListCtrl, wxDefaultPosition, wxSize(200,50));
- treelistSizer->Add(list, 1, wxEXPAND, 10);
+ treeSizer->Add(tree, 1, wxEXPAND, 0);
+
+ wxBoxSizer *treeCtrlSizer = new wxBoxSizer(wxHORIZONTAL);
+ treeadd = new wxButton(treePanel, TreeAdd, "Add", wxDefaultPosition, wxSize(60, 25));
+ treeCtrlSizer->Add(treeadd, 0, wxLEFT | wxRIGHT, 3);
+ treeremove = new wxButton(treePanel, TreeRemove, "Remove", wxDefaultPosition, wxSize(60, 25));
+ treeCtrlSizer->Add(treeremove, 0, wxLEFT | wxRIGHT, 3);
+ treerefresh = new wxButton(treePanel, TreeRefresh, "Refresh", wxDefaultPosition, wxSize(60, 25));
+ treeCtrlSizer->Add(treerefresh, 0, wxLEFT | wxRIGHT, 3);
+
+ treeSizer->Add(treeCtrlSizer, 1, wxALIGN_CENTER_HORIZONTAL, 0);
+
+ treePanel->SetSizer(treeSizer);
+
+ wxPanel* listPanel = new wxPanel(treelistPanel);
+ wxFlexGridSizer *listSizer = new wxFlexGridSizer(2, 1, 0, 0);
+ listSizer->AddGrowableCol(0);
+ listSizer->AddGrowableRow(0);
+
+ list = new wxbListCtrl(listPanel, this, ListCtrl, wxDefaultPosition, wxSize(200,50));
+ //treelistSizer->Add(list, 1, wxEXPAND, 10);
list->SetImageList(imagelist, wxIMAGE_LIST_SMALL);
info.SetText("Group");
info.SetAlign(wxLIST_FORMAT_RIGHT);
list->InsertColumn(6, info);
+
+ listSizer->Add(list, 1, wxEXPAND, 0);
+
+ wxBoxSizer *listCtrlSizer = new wxBoxSizer(wxHORIZONTAL);
+ listadd = new wxButton(listPanel, ListAdd, "Add", wxDefaultPosition, wxSize(60, 25));
+ listCtrlSizer->Add(listadd, 0, wxLEFT | wxRIGHT, 5);
+ listremove = new wxButton(listPanel, ListRemove, "Remove", wxDefaultPosition, wxSize(60, 25));
+ listCtrlSizer->Add(listremove, 0, wxLEFT | wxRIGHT, 5);
+ listrefresh = new wxButton(listPanel, ListRefresh, "Refresh", wxDefaultPosition, wxSize(60, 25));
+ listCtrlSizer->Add(listrefresh, 0, wxLEFT | wxRIGHT, 5);
- treelistSizer->AddGrowableCol(1);
- treelistSizer->AddGrowableRow(0);
+ listSizer->Add(listCtrlSizer, 1, wxALIGN_CENTER_HORIZONTAL, 0);
- treelistPanel->SetSizer(treelistSizer);
- treelistSizer->SetSizeHints(treelistPanel);
+ listPanel->SetSizer(listSizer);
+ treelistPanel->SplitVertically(treePanel, listPanel, 210);
+
+ treelistPanel->SetMinimumPaneSize(210);
+
treelistPanel->Show(false);
wxbConfig* config = new wxbConfig();
list->SetColumnWidth(i, 70);
}
- working = false;
SetCursor(*wxSTANDARD_CURSOR);
markWhenListingDone = false;
unsigned int i;
if (status == activable) {
wxbMainFrame::GetInstance()->SetStatusText("Getting parameters list.");
- wxbDataTokenizer* dt = WaitForEnd(".clients\n", true, false);
+ wxbDataTokenizer* dt = wxbUtils::WaitForEnd(".clients\n", true, false);
wxString str;
configPanel->ClearRowChoices("Client");
return;
}
- dt = WaitForEnd(".filesets\n", true, false);
+ dt = wxbUtils::WaitForEnd(".filesets\n", true, false);
configPanel->ClearRowChoices("Fileset");
restorePanel->ClearRowChoices("Fileset");
return;
}
- dt = WaitForEnd(".storage\n", true, false);
+ dt = wxbUtils::WaitForEnd(".storage\n", true, false);
configPanel->ClearRowChoices("Storage");
restorePanel->ClearRowChoices("Storage");
return;
}
- dt = WaitForEnd(".jobs\n", true, false);
+ dt = wxbUtils::WaitForEnd(".jobs\n", true, false);
configPanel->ClearRowChoices("Job Name");
return;
}
- dt = WaitForEnd(".pools\n", true, false);
+ dt = wxbUtils::WaitForEnd(".pools\n", true, false);
configPanel->ClearRowChoices("Pool");
SetStatus(choosing);
- WaitForPrompt(wxString("restore") <<
+ wxbUtils::WaitForPrompt(wxString("restore") <<
" client=\"" << configPanel->GetRowString("Client") <<
"\" fileset=\"" << configPanel->GetRowString("Fileset") <<
"\" pool=\"" << configPanel->GetRowString("Pool") <<
"\" storage=\"" << configPanel->GetRowString("Storage") << "\"\n");
- WaitForPrompt("6\n");
+ wxbUtils::WaitForPrompt("6\n");
//WaitForEnd();
- /*wxbPromptParser *pp = WaitForPrompt(wxString() << configPanel->GetRowString("Before") << "\n", true);
+ /*wxbPromptParser *pp = wxbUtils::WaitForPrompt(wxString() << configPanel->GetRowString("Before") << "\n", true);
int client = pp->getChoices()->Index(configPanel->GetRowString("Client"));
if (client == wxNOT_FOUND) {
wxbMainFrame::GetInstance()->SetStatusText("Failed to find the selected client.");
return;
}
- WaitForEnd("unmark *\n");
+ wxbUtils::WaitForEnd("unmark *\n");
wxTreeItemId root = tree->AddRoot(configPanel->GetRowString("Client"), -1, -1, new wxbTreeItemData("/", configPanel->GetRowString("Client"), 0));
currentTreeItem = root;
tree->Refresh();
- UpdateTreeItem(root, true);
+ tree->SelectItem(root);
+ CmdList(root);
wxbMainFrame::GetInstance()->SetStatusText("Right click on a file or on a directory, or double-click on its mark to add it to the restore list.");
tree->Expand(root);
}
int j;
dt = new wxbDataTokenizer(true);
- WaitForPrompt("done\n");
+ wxbUtils::WaitForPrompt("done\n");
SetStatus(configuring);
wxbDataTokenizer* dt;
SetStatus(restoring);
- WaitForEnd("yes\n");
+ wxbUtils::WaitForEnd("yes\n");
gauge->SetValue(0);
gauge->SetRange(totfilemessages);
wxDateTime currenttime;
- dt = WaitForEnd("time\n", true);
+ dt = wxbUtils::WaitForEnd("time\n", true);
wxStringTokenizer ttkz((*dt)[0], " ", wxTOKEN_STRTOK);
if ((currenttime.ParseDate(ttkz.GetNextToken()) == NULL) || // Date
(currenttime.ParseTime(ttkz.GetNextToken()) == NULL)) { // Time
wxbTableParser* tableparser;
while (true) {
- tableparser = CreateAndWaitForParser("list jobs\n");
+ tableparser = wxbUtils::CreateAndWaitForParser("list jobs\n");
wxDateTime jobtime;
long filemessages = 0;
while (true) {
- tableparser = CreateAndWaitForParser(cmd);
+ tableparser = wxbUtils::CreateAndWaitForParser(cmd);
if ((*tableparser)[0][7] != "C") {
break;
}
delete tableparser;
- dt = WaitForEnd("messages\n", true);
+ dt = wxbUtils::WaitForEnd("messages\n", true);
for (unsigned int i = 0; i < dt->GetCount(); i++) {
wxStringTokenizer tkz((*dt)[i], " ", wxTOKEN_STRTOK);
}
}
- WaitForEnd("messages\n");
+ wxbUtils::WaitForEnd("messages\n");
gauge->SetValue(totfilemessages);
}
wxStopWatch sw;
- while ((working) && (cancelled != 2)) {
+ while ((IsWorking()) && (cancelled != 2)) {
wxTheApp->Yield(true);
::wxUsleep(100);
if (sw.Time() > 30000) { /* 30 seconds timeout */
}
wxString def; //String to send if can't use our data
if ((cfgUpdated >> ConfigWhere) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- WaitForPrompt("9\n");
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbUtils::WaitForPrompt("9\n");
dt = new wxbDataTokenizer(true);
- WaitForPrompt(restorePanel->GetRowString("Where") + "\n");
+ wxbUtils::WaitForPrompt(restorePanel->GetRowString("Where") + "\n");
def = "/tmp";
cfgUpdated = cfgUpdated & (~(1 << ConfigWhere));
}
else if ((cfgUpdated >> ConfigReplace) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- WaitForPrompt("10\n");
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbUtils::WaitForPrompt("10\n");
dt = new wxbDataTokenizer(true);
- WaitForPrompt(wxString() << (restorePanel->GetRowSelection("Replace")+1) << "\n");
+ wxbUtils::WaitForPrompt(wxString() << (restorePanel->GetRowSelection("Replace")+1) << "\n");
def = "1";
cfgUpdated = cfgUpdated & (~(1 << ConfigReplace));
}
else if ((cfgUpdated >> ConfigWhen) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- WaitForPrompt("6\n");
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbUtils::WaitForPrompt("6\n");
dt = new wxbDataTokenizer(true);
- WaitForPrompt(restorePanel->GetRowString("When") + "\n");
+ wxbUtils::WaitForPrompt(restorePanel->GetRowString("When") + "\n");
def = "";
cfgUpdated = cfgUpdated & (~(1 << ConfigWhen));
}
else if ((cfgUpdated >> ConfigPriority) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- WaitForPrompt("7\n");
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbUtils::WaitForPrompt("7\n");
dt = new wxbDataTokenizer(true);
- WaitForPrompt(restorePanel->GetRowString("Priority") + "\n");
+ wxbUtils::WaitForPrompt(restorePanel->GetRowString("Priority") + "\n");
def = "10";
cfgUpdated = cfgUpdated & (~(1 << ConfigPriority));
}
else if ((cfgUpdated >> ConfigClient) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- wxbPromptParser *pp = WaitForPrompt("5\n", true);
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbPromptParser *pp = wxbUtils::WaitForPrompt("5\n", true);
int client = pp->getChoices()->Index(restorePanel->GetRowString("Client"));
if (client == wxNOT_FOUND) {
wxbMainFrame::GetInstance()->SetStatusText("Failed to find the selected client.");
}
delete pp;
dt = new wxbDataTokenizer(true);
- WaitForPrompt(wxString() << client << "\n");
+ wxbUtils::WaitForPrompt(wxString() << client << "\n");
def = "1";
cfgUpdated = cfgUpdated & (~(1 << ConfigClient));
}
else if ((cfgUpdated >> ConfigFileset) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- wxbPromptParser *pp = WaitForPrompt("4\n", true);
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbPromptParser *pp = wxbUtils::WaitForPrompt("4\n", true);
int fileset = pp->getChoices()->Index(restorePanel->GetRowString("Fileset"));
if (fileset == wxNOT_FOUND) {
wxbMainFrame::GetInstance()->SetStatusText("Failed to find the selected fileset.");
}
delete pp;
dt = new wxbDataTokenizer(true);
- WaitForPrompt(wxString() << fileset << "\n");
+ wxbUtils::WaitForPrompt(wxString() << fileset << "\n");
def = "1";
cfgUpdated = cfgUpdated & (~(1 << ConfigFileset));
}
else if ((cfgUpdated >> ConfigStorage) & 1) {
- WaitForPrompt("mod\n"); /* TODO: check results */
- wxbPromptParser *pp = WaitForPrompt("2\n", true);
+ wxbUtils::WaitForPrompt("mod\n"); /* TODO: check results */
+ wxbPromptParser *pp = wxbUtils::WaitForPrompt("2\n", true);
int fileset = pp->getChoices()->Index(restorePanel->GetRowString("Storage"));
if (fileset == wxNOT_FOUND) {
wxbMainFrame::GetInstance()->SetStatusText("Failed to find the selected storage.");
}
delete pp;
dt = new wxbDataTokenizer(true);
- WaitForPrompt(wxString() << fileset << "\n");
+ wxbUtils::WaitForPrompt(wxString() << fileset << "\n");
def = "1";
cfgUpdated = cfgUpdated & (~(1 << ConfigFileset));
}
if (i == dt->GetCount()) {
delete dt;
- dt = WaitForEnd(def + "\n", true);
+ dt = wxbUtils::WaitForEnd(def + "\n", true);
failed = true;
}
}
/* Cancel restore */
void wxbRestorePanel::CmdConfigCancel() {
- WaitForEnd("no\n");
+ wxbUtils::WaitForEnd("no\n");
wxbMainFrame::GetInstance()->Print("Restore cancelled.\n", CS_DEBUG);
wxbMainFrame::GetInstance()->SetStatusText("Restore cancelled.");
SetStatus(finished);
void wxbRestorePanel::CmdListJobs() {
if (status == entered) {
configPanel->ClearRowChoices("Before");
- WaitForPrompt("query\n");
- WaitForPrompt("6\n");
- wxbTableParser* tableparser = CreateAndWaitForParser(configPanel->GetRowString("Client") + "\n");
+ wxbUtils::WaitForPrompt("query\n");
+ wxbUtils::WaitForPrompt("6\n");
+ wxbTableParser* tableparser = wxbUtils::CreateAndWaitForParser(configPanel->GetRowString("Client") + "\n");
for (int i = tableparser->GetCount()-1; i > -1; i--) {
wxString str = (*tableparser)[i][3];
if (!item.IsOk()) {
return;
}
- UpdateTreeItem(item, (tree->GetSelection() == item));
+ UpdateTreeItem(item, true, false);
- if (list->GetItemCount() > 1) {
+ if (list->GetItemCount() >= 1) {
int firstwidth = list->GetSize().GetWidth();
for (int i = 2; i < 7; i++) {
list->SetColumnWidth(i, wxLIST_AUTOSIZE);
firstwidth -= 18;
list->SetColumnWidth(1, wxLIST_AUTOSIZE);
if (list->GetColumnWidth(1) < firstwidth) {
- list->SetColumnWidth(1, firstwidth-20);
+ list->SetColumnWidth(1, firstwidth-25);
}
}
}
}
/* Mark a treeitem (directory) or a listitem (file or directory) */
-void wxbRestorePanel::CmdMark(wxTreeItemId treeitem, long listitem) {
+void wxbRestorePanel::CmdMark(wxTreeItemId treeitem, long* listitems, int listsize, int state) {
if (status == choosing) {
- wxbTreeItemData* itemdata = NULL;
- if (listitem != -1) {
- itemdata = (wxbTreeItemData*)list->GetItemData(listitem);
+ wxbTreeItemData** itemdata;
+ int itemdatasize = 0;
+ if (listsize == 0) {
+ itemdata = new wxbTreeItemData*[1];
+ itemdatasize = 1;
+ }
+ else {
+ itemdata = new wxbTreeItemData*[listsize];
+ itemdatasize = listsize;
+ }
+
+ if (listitems != NULL) {
+ for (int i = 0; i < listsize; i++) {
+ itemdata[i] = (wxbTreeItemData*)list->GetItemData(listitems[i]);
+ }
}
else if (treeitem.IsOk()) {
- itemdata = (wxbTreeItemData*)tree->GetItemData(treeitem);
+ itemdata[0] = (wxbTreeItemData*)tree->GetItemData(treeitem);
}
else {
+ delete[] itemdata;
return;
}
- if (itemdata == NULL) //Should never happen
+ if (itemdata[0] == NULL) { //Should never happen
+ delete[] itemdata;
return;
+ }
- wxString dir = itemdata->GetPath();
+ wxString dir = itemdata[0]->GetPath();
wxString file;
if (dir != "/") {
file = "*";
}
- WaitForEnd(wxString("cd \"") << dir << "\"\n");
- WaitForEnd(wxString((itemdata->GetMarked() == 1) ? "unmark" : "mark") << " \"" << file << "\"\n");
+ if (state == -1) {
+ bool marked = false;
+ bool unmarked = false;
+ state = 0;
+ for (int i = 0; i < itemdatasize; i++) {
+ switch(itemdata[i]->GetMarked()) {
+ case 0:
+ unmarked = true;
+ break;
+ case 1:
+ marked = true;
+ break;
+ case 2:
+ marked = true;
+ unmarked = true;
+ break;
+ default:
+ break;
+ }
+ if (marked && unmarked)
+ break;
+ }
+ if (marked) {
+ if (unmarked) {
+ state = 1;
+ }
+ else {
+ state = 0;
+ }
+ }
+ else {
+ state = 1;
+ }
+ }
+
+ wxbUtils::WaitForEnd(wxString("cd \"") << dir << "\"\n");
+ wxbUtils::WaitForEnd(wxString((state==1) ? "mark" : "unmark") << " \"" << file << "\"\n");
/* TODO: Check commands results */
itemdata->SetMarked((itemdata->GetMarked() == 1) ? 0 : 1);
}*/
- if (listitem == -1) { /* tree item state changed */
- SetTreeItemState(treeitem, (itemdata->GetMarked() == 1) ? 0 : 1);
+ if (listitems == NULL) { /* tree item state changed */
+ SetTreeItemState(treeitem, state);
/*treeitem = tree->GetSelection();
UpdateTree(treeitem, true);
treeitem = tree->GetItemParent(treeitem);*/
}
else {
- SetListItemState(listitem, (itemdata->GetMarked() == 1) ? 0 : 1);
+ for (int i = 0; i < listsize; i++) {
+ SetListItemState(listitems[i], state);
+ }
/*UpdateTree(treeitem, (tree->GetSelection() == treeitem));
treeitem = tree->GetItemParent(treeitem);*/
}
WaitForList(treeitem, false);
treeitem = tree->GetItemParent(treeitem);
}*/
+
+ delete[] itemdata;
}
}
General functions
----------------------------------------------------------------------------*/
-/* Parse a table in tableParser */
-wxbTableParser* wxbRestorePanel::CreateAndWaitForParser(wxString cmd) {
- wxbTableParser* tableParser = new wxbTableParser();
-
- wxbMainFrame::GetInstance()->Send(cmd);
-
- //time_t base = wxDateTime::Now().GetTicks();
- while (!tableParser->hasFinished()) {
- //innerThread->Yield();
- wxTheApp->Yield(true);
- ::wxUsleep(100);
- //if (base+15 < wxDateTime::Now().GetTicks()) break;
- }
- return tableParser;
-}
-
-/* Run a command, and waits until prompt result is fully received,
- * if keepresults is true, returns a valid pointer to a wxbPromptParser
- * containing the data. */
-wxbPromptParser* wxbRestorePanel::WaitForPrompt(wxString cmd, bool keepresults) {
- wxbPromptParser* promptParser = new wxbPromptParser();
-
- wxbMainFrame::GetInstance()->Send(cmd);
-
- //time_t base = wxDateTime::Now().GetTicks();
- while (!promptParser->hasFinished()) {
- //innerThread->Yield();
- wxTheApp->Yield(true);
- ::wxUsleep(100);
- //if (base+15 < wxDateTime::Now().GetTicks()) break;
- }
-
- if (keepresults) {
- return promptParser;
- }
- else {
- delete promptParser;
- return NULL;
- }
-}
-
-/* Run a command, and waits until result is fully received. */
-wxbDataTokenizer* wxbRestorePanel::WaitForEnd(wxString cmd, bool keepresults, bool linebyline) {
- wxbDataTokenizer* datatokenizer = new wxbDataTokenizer(linebyline);
-
- wxbMainFrame::GetInstance()->Send(cmd);
-
- //wxbMainFrame::GetInstance()->Print("(<WFE)", CS_DEBUG);
-
- //time_t base = wxDateTime::Now().GetTicks();
- while (!datatokenizer->hasFinished()) {
- //innerThread->Yield();
- wxTheApp->Yield(true);
- ::wxUsleep(100);
- //if (base+15 < wxDateTime::Now().GetTicks()) break;
- }
-
- //wxbMainFrame::GetInstance()->Print("(>WFE)", CS_DEBUG);
-
- if (keepresults) {
- return datatokenizer;
- }
- else {
- delete datatokenizer;
- return NULL;
- }
-}
-
/* Run a dir command, and waits until result is fully received. */
-void wxbRestorePanel::UpdateTreeItem(wxTreeItemId item, bool updatelist) {
+void wxbRestorePanel::UpdateTreeItem(wxTreeItemId item, bool updatelist, bool recurse) {
// this->updatelist = updatelist;
wxbDataTokenizer* dt;
- dt = WaitForEnd(wxString("cd \"") <<
+ dt = wxbUtils::WaitForEnd(wxString("cd \"") <<
static_cast<wxbTreeItemData*>(tree->GetItemData(item))
->GetPath() << "\"\n", false);
if (updatelist)
list->DeleteAllItems();
- dt = WaitForEnd("dir\n", true);
+ dt = wxbUtils::WaitForEnd("dir\n", true);
wxString str;
tree->SetItemImage(treeid, stat, wxTreeItemIcon_Selected);
static_cast<wxbTreeItemData*>(tree->GetItemData(treeid))->SetMarked(file[6]);
}
+ if ((recurse) && (tree->IsExpanded(treeid))) {
+ UpdateTreeItem(treeid, false, true);
+ }
updated = true;
break;
}
/* Parse dir command results. */
wxString* wxbRestorePanel::ParseList(wxString line) {
- //drwx------ 11 1003 42949672 0 2001-07-30 16:45:14 *filename
- //+ 10 ++ 4++ 10 ++ 8 ++ 8 + + 19 + *+ ->
- //0 10 14 24 32 42 62
+ /* See ls_output in dird/ua_tree.c */
+
+ //drwxrwxrwx 1 root root 0 2004-04-03 14:35:21 f:/tocd/NVSU 1.00.00/
+ //+ 10 + ++ + 8 + + 8 ++ 8 + + 19 + *+ ->
+ //0 12 15 24 32 42 62
if (line.Length() < 63)
return NULL;
wxString* ret = new wxString[9];
ret[0] = line.Mid(0, 10).Trim();
- ret[1] = line.Mid(10, 4).Trim();
- ret[2] = line.Mid(14, 10).Trim();
+ ret[1] = line.Mid(12, 2).Trim();
+ ret[2] = line.Mid(15, 8).Trim();
ret[3] = line.Mid(24, 8).Trim();
ret[4] = line.Mid(32, 8).Trim();
ret[5] = line.Mid(42, 19).Trim();
UpdateTreeItemState(tree->GetItemParent(item));
}
-/*
- * Refresh a tree item, and all its childs,
- * by asking the director for new lists
- */
-void wxbRestorePanel::RefreshTree(wxTreeItemId item) {
-/* UpdateTreeItem(item, updatelist);*/
+/* Refresh the whole tree. */
+void wxbRestorePanel::RefreshTree() {
+ /* Save current selection */
+ wxArrayString current;
+
+ wxTreeItemId item = currentTreeItem;
+
+ while ((item.IsOk()) && (item != tree->GetRootItem())) {
+ current.Add(tree->GetItemText(item));
+ item = tree->GetItemParent(item);
+ }
- /* Update all child which are not collapsed */
-/* long cookie;
- wxTreeItemId currentChild = tree->GetFirstChild(item, cookie);
+ /* Update the tree */
+ UpdateTreeItem(tree->GetRootItem(), false, true);
- while (currentChild.IsOk()) {
- if (tree->IsExpanded(currentChild))
- UpdateTree(currentChild, false);
+ /* Reselect the former selected item */
+ item = tree->GetRootItem();
+
+ if (current.Count() == 0) {
+ tree->SelectItem(item);
+ return;
+ }
+
+ bool match;
+
+ for (int i = current.Count()-1; i >= 0; i--) {
+ long cookie;
+ wxTreeItemId currentChild = tree->GetFirstChild(item, cookie);
+
+ match = false;
+
+ while (currentChild.IsOk()) {
+ if (tree->GetItemText(currentChild) == current[i]) {
+ item = currentChild;
+ match = true;
+ break;
+ }
+
+ currentChild = tree->GetNextChild(item, cookie);
+ }
+
+ if (!match) break;
+ }
+
+ UpdateTreeItem(item, true, false); /* Update the list */
+
+ tree->SelectItem(item);
+}
- currentChild = tree->GetNextChild(item, cookie);
- }*/
+void wxbRestorePanel::RefreshList() {
+ if (currentTreeItem.IsOk()) {
+ UpdateTreeItem(currentTreeItem, true, false); /* Update the list */
+ }
}
/* Update first config, adapting settings to the job name selected */
void wxbRestorePanel::UpdateFirstConfig() {
configPanel->Enable(false);
- wxbDataTokenizer* dt = WaitForEnd(wxString(".defaults job=") + configPanel->GetRowString("Job Name") + "\n", true, false);
+ wxbDataTokenizer* dt = wxbUtils::WaitForEnd(wxString(".defaults job=") + configPanel->GetRowString("Job Name") + "\n", true, false);
/* job=RestoreFiles
* pool=Default
* messages=Standard
this->Layout();
tree->Enable(true);
list->Enable(true);
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
break;
case configuring:
start->Enable(false);
configPanel->Enable(false);
tree->Enable(false);
list->Enable(false);
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
break;
}
status = newstatus;
UI related
----------------------------------------------------------------------------*/
+void wxbRestorePanel::SetWorking(bool working) {
+ this->working = working;
+ if (working) {
+ SetCursor(*wxHOURGLASS_CURSOR);
+// SetEvtHandlerEnabled(false); //EVTQUEUE
+ }
+// else if (!processing) { /* Empty event queue if we aren't already doing this */ //EVTQUEUE
+ else {
+// processing = true; //EVTQUEUE
+ SetCursor(*wxSTANDARD_CURSOR);
+// SetEvtHandlerEnabled(true); //EVTQUEUE
+/* wxNode *node = pendingEvents->First(); //EVTQUEUE
+ while ( node ) {
+ wxEvent *event = (wxEvent *)node->Data();
+ delete node;
+
+ wxEvtHandler::ProcessEvent(*event);
+ delete event;
+
+ node = pendingEvents->First();
+ }
+ processing = false;*/
+ }
+}
+
+bool wxbRestorePanel::IsWorking() {
+ return this->working;
+}
+
void wxbRestorePanel::EnableConfig(bool enable) {
restorePanel->Enable(enable);
}
Event handling
----------------------------------------------------------------------------*/
-void wxbRestorePanel::OnCancel(wxCommandEvent& WXUNUSED(event)) {
+
+//EVTQUEUE
+/*
+bool wxbRestorePanel::ProcessEvent(wxEvent& event) {
+ if (IsWorking() || processing) {
+ wxEvent *eventCopy = event.Clone();
+
+ pendingEvents->Append(eventCopy);
+ return TRUE;
+ }
+ else {
+ return wxEvtHandler::ProcessEvent(event);
+ }
+}
+*/
+
+void wxbRestorePanel::OnCancel(wxCommandEvent& event) {
cancel->Enable(false);
SetCursor(*wxHOURGLASS_CURSOR);
CmdCancel();
SetCursor(*wxSTANDARD_CURSOR);
}
-void wxbRestorePanel::OnStart(wxCommandEvent& WXUNUSED(event)) {
- if (working) {
+void wxbRestorePanel::OnStart(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
CmdStart();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
void wxbRestorePanel::OnTreeChanging(wxTreeEvent& event) {
- if (working) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
event.Veto();
}
}
void wxbRestorePanel::OnTreeExpanding(wxTreeEvent& event) {
- if (working) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
event.Veto();
return;
}
}
void wxbRestorePanel::OnTreeChanged(wxTreeEvent& event) {
- if (working) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
return;
}
if (currentTreeItem == event.GetItem()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
+ treeadd->Enable(false);
+ treeremove->Enable(false);
+ treerefresh->Enable(false);
markWhenListingDone = false;
- working = true;
+ SetWorking(true);
currentTreeItem = event.GetItem();
CmdList(event.GetItem());
if (markWhenListingDone) {
- CmdMark(event.GetItem(), -1);
+ CmdMark(event.GetItem(), NULL, 0);
tree->Refresh();
}
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
+ if (event.GetItem().IsOk()) {
+ int status = ((wxbTreeItemData*)tree->GetItemData(event.GetItem()))->GetMarked();
+ treeadd->Enable(status != 1);
+ treeremove->Enable(status != 0);
+ }
+ treerefresh->Enable(true);
}
void wxbRestorePanel::OnTreeMarked(wxbTreeMarkedEvent& event) {
- if (working) {
+ csprint("Tree marked", CS_DEBUG);
+ if (IsWorking()) {
if (tree->GetSelection() == event.GetItem()) {
markWhenListingDone = !markWhenListingDone;
}
+ AddPendingEvent(event);
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
- CmdMark(event.GetItem(), -1);
+ SetWorking(true);
+ CmdMark(event.GetItem(), NULL, 0);
//event.Skip();
tree->Refresh();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
+ if (event.GetItem().IsOk()) {
+ int status = ((wxbTreeItemData*)tree->GetItemData(event.GetItem()))->GetMarked();
+ treeadd->Enable(status != 1);
+ treeremove->Enable(status != 0);
+ }
+}
+
+void wxbRestorePanel::OnTreeAdd(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ if (currentTreeItem.IsOk()) {
+ SetWorking(true);
+ CmdMark(currentTreeItem, NULL, 0, 1);
+ tree->Refresh();
+ treeadd->Enable(0);
+ treeremove->Enable(1);
+ SetWorking(false);
+ }
+}
+
+void wxbRestorePanel::OnTreeRemove(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ if (currentTreeItem.IsOk()) {
+ SetWorking(true);
+ CmdMark(currentTreeItem, NULL, 0, 0);
+ tree->Refresh();
+ treeadd->Enable(1);
+ treeremove->Enable(0);
+ SetWorking(false);
+ }
+}
+
+void wxbRestorePanel::OnTreeRefresh(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ SetWorking(true);
+ RefreshTree();
+ SetWorking(false);
}
void wxbRestorePanel::OnListMarked(wxbListMarkedEvent& event) {
- if (working) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
//event.Skip();
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
- //long item = event.GetId();
- long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
- CmdMark(wxTreeItemId(), item);
+
+ if (list->GetSelectedItemCount() == 0) {
+ return;
+ }
+
+ SetWorking(true);
+
+ long* items = new long[list->GetSelectedItemCount()];
+
+ int num = 0;
+
+ long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ while (item != -1) {
+ items[num] = item;
+ num++;
+ item = list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+
+ CmdMark(wxTreeItemId(), items, num);
+
+ delete[] items;
+
+ wxListEvent listevt;
+
+ OnListChanged(listevt);
+
event.Skip();
tree->Refresh();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
void wxbRestorePanel::OnListActivated(wxListEvent& event) {
- if (working) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
//event.Skip();
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
- long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
+ SetWorking(true);
+ long item = event.GetIndex();
+// long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED);
if (item > -1) {
wxbTreeItemData* itemdata = (wxbTreeItemData*)list->GetItemData(item);
wxString name = itemdata->GetName();
wxString name2 = tree->GetItemText(currentChild);
if (name2 == name) {
//tree->UnselectAll();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
tree->Expand(currentTreeItem);
tree->SelectItem(currentChild);
//tree->Refresh();
}
}
}
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
+}
+
+void wxbRestorePanel::OnListChanged(wxListEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ listadd->Enable(false);
+ listremove->Enable(false);
+
+ bool marked = false;
+ bool unmarked = false;
+
+ long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ while (item != -1) {
+ switch (((wxbTreeItemData*)list->GetItemData(item))->GetMarked()) {
+ case 0:
+ unmarked = true;
+ break;
+ case 1:
+ marked = true;
+ break;
+ case 2:
+ marked = true;
+ unmarked = true;
+ break;
+ default:
+ break;
+ // Should never happen
+ }
+ if (marked && unmarked) break;
+ item = list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+
+ listadd->Enable(unmarked);
+ listremove->Enable(marked);
+}
+
+void wxbRestorePanel::OnListAdd(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ SetWorking(true);
+
+ long* items = new long[list->GetSelectedItemCount()];
+
+ int num = 0;
+
+ long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ while (item != -1) {
+ items[num] = item;
+ num++;
+ item = list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+
+ CmdMark(wxTreeItemId(), items, num, 1);
+
+ delete[] items;
+
+ tree->Refresh();
+ SetWorking(false);
+
+ listadd->Enable(false);
+ listremove->Enable(true);
+}
+
+void wxbRestorePanel::OnListRemove(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ SetWorking(true);
+
+ long* items = new long[list->GetSelectedItemCount()];
+
+ int num = 0;
+
+ long item = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ while (item != -1) {
+ items[num] = item;
+ num++;
+ item = list->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+ }
+
+ CmdMark(wxTreeItemId(), items, num, 0);
+
+ delete[] items;
+
+ tree->Refresh();
+ SetWorking(false);
+
+ listadd->Enable(true);
+ listremove->Enable(false);
+}
+
+void wxbRestorePanel::OnListRefresh(wxCommandEvent& event) {
+ if (IsWorking()) {
+ AddPendingEvent(event);
+ return;
+ }
+
+ SetWorking(true);
+ RefreshList();
+ SetWorking(false);
}
void wxbRestorePanel::OnConfigUpdated(wxCommandEvent& event) {
if (status == entered) {
if (event.GetId() == ConfigJobName) {
- if (working) {
+ if (IsWorking()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
UpdateFirstConfig();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
else if (event.GetId() == ConfigClient) {
- if (working) {
+ if (IsWorking()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
configPanel->Enable(false);
CmdListJobs();
configPanel->Enable(true);
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
cfgUpdated = cfgUpdated | (1 << event.GetId());
}
void wxbRestorePanel::OnConfigOk(wxCommandEvent& WXUNUSED(event)) {
if (status != configuring) return;
- if (working) {
+ if (IsWorking()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
CmdStart();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
void wxbRestorePanel::OnConfigApply(wxCommandEvent& WXUNUSED(event)) {
if (status != configuring) return;
- if (working) {
+ if (IsWorking()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
CmdConfigApply();
if (cfgUpdated == 0) {
restorePanel->EnableApply(false);
}
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
+ SetWorking(false);
}
void wxbRestorePanel::OnConfigCancel(wxCommandEvent& WXUNUSED(event)) {
if (status != configuring) return;
- if (working) {
+ if (IsWorking()) {
return;
}
- SetCursor(*wxHOURGLASS_CURSOR);
- working = true;
+ SetWorking(true);
CmdConfigCancel();
- working = false;
- SetCursor(*wxSTANDARD_CURSOR);
-}
-
-/* TODO : correct that bad implementation of tree marked event forwarding */
-
-wxbTreeListPanel::wxbTreeListPanel(wxbRestorePanel* parent): wxPanel(parent, -1) {
- this->parent = parent;
+ SetWorking(false);
}
-void wxbTreeListPanel::OnTreeMarked(wxbTreeMarkedEvent& event) {
- parent->OnTreeMarked(event);
-}
-
-void wxbTreeListPanel::OnListMarked(wxbListMarkedEvent& event) {
- parent->OnListMarked(event);
-}
projects / bacula / bacula / blobdiff