Superminaren
/
sample-hive
mirror of https://gitlab.com/samplehive/sample-hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Right-Click Add/Remove Favorites

This commit is contained in:
Mill J 2021-06-13 20:46:22 +00:00 committed by Apoorv
parent b28b0b31c7
commit 14de355bd2
1 changed files with 80 additions and 382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

424
src/MainFrame.cpp
View File

@ -869,7 +869,7 @@ void MainFrame::OnClickSampleView(wxDataViewEvent& event)
void MainFrame::OnShowSampleListViewContextMenu(wxDataViewEvent& event) void MainFrame::OnShowSampleListViewContextMenu(wxDataViewEvent& event)
{ {
TagEditor* tagEditor; TagEditor* tagEditor;
// Settings settings(m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this,m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); Database db(*m_InfoBar);
wxString msg; wxString msg;
@ -882,19 +882,11 @@ void MainFrame::OnShowSampleListViewContextMenu(wxDataViewEvent& event)
else else
return; return;
wxString selection = m_SampleListView->GetTextValue(selected_row, 1).BeforeLast('.'); wxString selection;
if(settings.IsShowFileExtension())
// wxString sample_with_extension = db.GetSamplePathByFilename(selection.BeforeLast('.').ToStdString()); selection = m_SampleListView->GetTextValue(selected_row, 1).BeforeLast('.');
// wxString sample_without_extension = db.GetSamplePathByFilename(selection.ToStdString()); else
selection = m_SampleListView->GetTextValue(selected_row, 1);
// std::string extension = settings.IsShowFileExtension() ?
// db.GetSampleFileExtension(selection.ToStdString()) :
// db.GetSampleFileExtension(selection.BeforeLast('.').ToStdString());
// wxString sample = selection.Contains(wxString::Format(".%s", extension)) ?
// sample_with_extension : sample_without_extension;
// std::string filename = sample.AfterLast('/').BeforeLast('.').ToStdString();
wxString sample_path = GetFileNamePathAndExtension(selection).Path; wxString sample_path = GetFileNamePathAndExtension(selection).Path;
std::string filename = GetFileNamePathAndExtension(selection).Filename; std::string filename = GetFileNamePathAndExtension(selection).Filename;
@ -902,15 +894,15 @@ void MainFrame::OnShowSampleListViewContextMenu(wxDataViewEvent& event)
wxMenu menu; wxMenu menu;
// if (m_SampleListView->GetToggleValue(selected_row, 0)) //true = add; false = remove;
// menu.Append(MN_FavoriteSample, "Remove from favorites"); bool favorite_add = false;
// else
// menu.Append(MN_FavoriteSample, "Add to favorites");
if (db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 1) if (db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 1)
menu.Append(MN_FavoriteSample, "Remove from favorites"); menu.Append(MN_FavoriteSample, "Remove from favorites");
else else
{
menu.Append(MN_FavoriteSample, "Add to favorites"); menu.Append(MN_FavoriteSample, "Add to favorites");
favorite_add = true;
}
menu.Append(MN_DeleteSample, "Delete"); menu.Append(MN_DeleteSample, "Delete");
menu.Append(MN_TrashSample, "Trash"); menu.Append(MN_TrashSample, "Trash");
@ -924,381 +916,87 @@ void MainFrame::OnShowSampleListViewContextMenu(wxDataViewEvent& event)
{ {
case MN_FavoriteSample: case MN_FavoriteSample:
{ {
int row = 0, container_row = 0; //Get Folder Name and location
std::string folder_name = "Favourites";
wxDataViewItem folder_selection = m_CollectionView->GetSelection();
if(folder_selection.IsOk() && m_CollectionView->IsContainer(folder_selection))
folder_name = m_CollectionView->GetItemText(folder_selection).ToStdString();
if (m_SampleListView->GetSelectedItemsCount() <= 1) //Get Tree Root And Temp Items
wxDataViewItem root = wxDataViewItem(wxNullPtr);
wxDataViewItem itm;
wxDataViewItem itm2;
//Get All Selected Samples
wxDataViewItemArray samples;
int sample_count = m_SampleListView->GetSelections(samples);
int selected_row = 0;
wxString selection;
int db_status = 0;
for(int k = 0; k < sample_count; k++)
{ {
// if(!column) //Get Filename
// { selected_row = m_SampleListView->ItemToRow(samples[k]);
// wxLogDebug("Column is not OK"); if (selected_row < 0) continue;
// return;
// }
// if (m_SampleListView->GetToggleValue(selected_row, 0)) if(settings.IsShowFileExtension())
// if(db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 1) selection = m_SampleListView->GetTextValue(selected_row, 1).BeforeLast('.');
// { else
// // m_SampleListView->SetToggleValue(false, selected_row, 0); selection = m_SampleListView->GetTextValue(selected_row, 1);
// CheckForDuplicates(selection, selected_row);
// msg = wxString::Format("Toggle: false");
// }
// else if(db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 0)
// {
// // m_SampleListView->SetToggleValue(true, selected_row, 0);
// CheckForDuplicates(selection, selected_row);
// msg = wxString::Format("Toggle: true");
// }
std::deque<wxDataViewItem> nodes;
nodes.push_back(m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row));
wxDataViewItem found_item; //Check Database
db_status = db.GetFavoriteColumnValueByFilename(selection.ToStdString());
// if(!column) //Aleady Added, Do Nothing
// { if(favorite_add && db_status == 1)
// wxLogDebug("something wrong with column..");
// return;
// }
if(db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 0)
{
wxLogDebug("Column matches.. looking!");
while(!nodes.empty())
{
wxDataViewItem current_item = nodes.front();
nodes.pop_front();
if (m_CollectionView->GetItemText(current_item) == selection)
{
found_item = current_item;
wxLogDebug(m_CollectionView->GetItemText(current_item));
break;
}
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{
container_row++;
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue; continue;
}
child = m_CollectionView->GetNthChild(current_item, row); //Already Removed, Do Nothing
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child)); if(!favorite_add && db_status == 0)
continue;
nodes.push_back(child); //Add To Favorites
row++; if(favorite_add && db_status == 0)
}
}
nodes.clear();
if (found_item.IsOk())
{ {
wxString msg = wxString::Format("%s already added as favorite.", selection);
wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION);
msgDialog.ShowModal();
}
else
{
wxLogDebug("Sample not found adding as fav.");
wxDataViewItem selected = m_CollectionView->GetSelection();
wxString folder;
if(selected.IsOk() && m_CollectionView->IsContainer(selected))
{
folder = m_CollectionView->GetItemText(selected);
m_CollectionView->AppendItem(selected, selection);
}
else
{
folder = m_CollectionView->GetItemText(favorites_folder);
m_CollectionView->AppendItem(favorites_folder, selection);
}
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_COLOURED))), m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_COLOURED))),
selected_row, 0); selected_row, 0);
db.UpdateFavoriteColumn(selection.ToStdString(), 1); db.UpdateFavoriteColumn(selection.ToStdString(), 1);
db.UpdateFavoriteFolder(selection.ToStdString(), folder.ToStdString()); db.UpdateFavoriteFolder(selection.ToStdString(), folder_name);
wxLogDebug("Adding %s to folder: %s", selection, folder); for(int i = 0; i < m_CollectionView->GetChildCount(root); i++)
}
}
else if(db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 1)
{ {
wxString folder_name = db.GetFavoriteFolderByFilename(selection.ToStdString()); itm = m_CollectionView->GetNthChild(root,i);
while(!nodes.empty()) if(m_CollectionView->GetItemText(itm).ToStdString() == folder_name)
{ {
wxDataViewItem current_item = nodes.front(); m_CollectionView->AppendItem(itm,selection,-1,NULL);
nodes.pop_front();
wxLogDebug("%s folder name is: %s", selection, folder_name);
if (m_CollectionView->GetItemText(current_item) == folder_name)
{
found_item = current_item;
wxLogDebug("Found folder: %s", m_CollectionView->GetItemText(found_item));
}
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{
container_row++;
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue;
}
child = m_CollectionView->GetNthChild(current_item, row);
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
if (m_CollectionView->GetItemText(child) == selection)
{
found_item = child;
wxLogDebug("Will delete %s", m_CollectionView->GetItemText(found_item));
break; break;
} }
nodes.push_back(child);
row++;
} }
wxLogDebug("Adding %s to %s", selection, folder_name);
} }
else
nodes.clear();
if (found_item.IsOk())
{ {
wxLogDebug("Folder: %s :: Child: %s", folder_name, m_CollectionView->GetItemText(found_item)); //Remove From Favorites
m_CollectionView->DeleteItem(found_item);
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE))), m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE))),
selected_row, 0); selected_row, 0);
db.UpdateFavoriteColumn(selection.ToStdString(), 0); db.UpdateFavoriteColumn(selection.ToStdString(), 0);
db.UpdateFavoriteFolder(selection.ToStdString(), m_CollectionView->GetItemText(favorites_folder).ToStdString()); db.UpdateFavoriteFolder(selection.ToStdString(), "");
}
else for(int i = 0; i < m_CollectionView->GetChildCount(root); i++)
{ {
wxLogDebug("%s not added as favorite, cannot delete.", selection); itm = m_CollectionView->GetNthChild(root,i);
} for(int j = 0; j < m_CollectionView->GetChildCount(itm); j++)
}
}
else
{ {
wxDataViewItemArray items; itm2 = m_CollectionView->GetNthChild(itm,j);
int rows = m_SampleListView->GetSelections(items); if(m_CollectionView->GetItemText(itm2) == selection)
std::deque<wxDataViewItem> nodes;
nodes.push_back(m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row));
wxDataViewItem found_item;
wxFileDataObject file_data;
wxArrayString files;
wxString name;
for (int i = 0; i < rows; i++)
{ {
int item_row = m_SampleListView->ItemToRow(items[i]); m_CollectionView->DeleteItem(itm2);
name = m_SampleListView->GetTextValue(item_row, 1);
file_data.AddFile(name.BeforeLast('.'));
files = file_data.GetFilenames();
// if (m_SampleListView->GetToggleValue(row, 0))
// {
// m_SampleListView->SetToggleValue(false, row, 0);
// msg = wxString::Format("Toggle: false");
// }
// else
// {
// m_SampleListView->SetToggleValue(true, row, 0);
// msg = wxString::Format("Toggle: true");
// }
if(db.GetFavoriteColumnValueByFilename(files[i].ToStdString()) == 0)
{
wxLogDebug("Column matches.. looking!");
while(!nodes.empty())
{
wxDataViewItem current_item = nodes.front();
nodes.pop_front();
if (m_CollectionView->GetItemText(current_item) == files[i])
{
found_item = current_item;
wxLogDebug(m_CollectionView->GetItemText(current_item));
break; break;
} }
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{
container_row++;
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue;
}
child = m_CollectionView->GetNthChild(current_item, row);
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
nodes.push_back(child);
row++;
}
}
nodes.clear();
if (found_item.IsOk())
{
wxString msg = wxString::Format("%s already added as favorite.", files[i]);
wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION);
msgDialog.ShowModal();
}
else
{
wxLogDebug("Sample not found adding as fav.");
wxDataViewItem selected = m_CollectionView->GetSelection();
wxString folder;
if(selected.IsOk() && m_CollectionView->IsContainer(selected))
{
folder = m_CollectionView->GetItemText(selected);
m_CollectionView->AppendItem(selected, files[i]);
}
else
{
folder = m_CollectionView->GetItemText(favorites_folder);
m_CollectionView->AppendItem(favorites_folder, files[i]);
}
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_COLOURED))),
item_row, 0);
db.UpdateFavoriteColumn(files[i].ToStdString(), 1);
db.UpdateFavoriteFolder(files[i].ToStdString(), folder.ToStdString());
wxLogDebug("Adding %s to folder: %s", files[i], folder);
}
}
else if(db.GetFavoriteColumnValueByFilename(files[i].ToStdString()) == 1)
{
wxString folder_name = db.GetFavoriteFolderByFilename(files[i].ToStdString());
while(!nodes.empty())
{
wxDataViewItem current_item = nodes.front();
nodes.pop_front();
wxLogDebug("%s folder name is: %s", files[i], folder_name);
if (m_CollectionView->GetItemText(current_item) == folder_name)
{
found_item = current_item;
wxLogDebug("Found folder: %s", m_CollectionView->GetItemText(found_item));
}
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{
container_row++;
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue;
}
child = m_CollectionView->GetNthChild(current_item, row);
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
if (m_CollectionView->GetItemText(child) == files[i])
{
found_item = child;
wxLogDebug("Will delete %s", m_CollectionView->GetItemText(found_item));
break;
}
nodes.push_back(child);
row++;
}
}
nodes.clear();
if (found_item.IsOk())
{
wxLogDebug("Folder: %s :: Child: %s", folder_name, m_CollectionView->GetItemText(found_item));
m_CollectionView->DeleteItem(found_item);
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE))),
item_row, 0);
db.UpdateFavoriteColumn(files[i].ToStdString(), 0);
db.UpdateFavoriteFolder(files[i].ToStdString(), m_CollectionView->GetItemText(favorites_folder).ToStdString());
}
else
{
wxLogDebug("%s not added as favorite, cannot delete.", files[i]);
} }
} }
} }