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

Merge branch 'refactor_database' into 'testing' 

Refactor database

See merge request samplehive/sample-hive!7
This commit is contained in:
Apoorv 2021-10-08 07:29:27 +00:00
parent fe463fe199 c7005dd559
commit 4630695589
9 changed files with 696 additions and 1193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -23,7 +23,7 @@ project('SampleHive',
license : 'GPL v3', license : 'GPL v3',
meson_version: '>= 0.58.0', meson_version: '>= 0.58.0',
default_options : ['warning_level=1', default_options : ['warning_level=1',
'cpp_std=c++11']) 'cpp_std=c++14'])
meson_src_root = meson.current_source_dir() meson_src_root = meson.current_source_dir()
meson_build_root = meson.current_build_dir() meson_build_root = meson.current_build_dir()

1539
src/Database.cpp
View File

File diff suppressed because it is too large Load Diff

60
src/Database.hpp
View File

@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#pragma once
#include "Sample.hpp" #include "Sample.hpp"
@ -36,7 +37,7 @@
class Database class Database
{ {
public: public:
Database(wxInfoBar& infoBar); Database(wxInfoBar& infoBar, const std::string& dbPath);
~Database(); ~Database();
private: private:
@ -44,69 +45,68 @@ class Database
sqlite3* m_Database; sqlite3* m_Database;
int rc; int rc;
char* m_ErrMsg; char* m_ErrMsg;
sqlite3_stmt* m_Stmt;
private: private:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
wxInfoBar& m_InfoBar; wxInfoBar& m_InfoBar;
void open(const std::string& dbPath);
void close();
public: public:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Create the table // Create the table
void CreateTableSamples(const std::string& dbPath); void CreateTableSamples();
void CreateTableHives(const std::string& dbPath); void CreateTableHives();
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Insert into database // Insert into database
void InsertIntoSamples(const std::string& dbPath, std::vector<Sample>); void InsertIntoSamples(const std::vector<Sample>&);
void InsertIntoHives(const std::string& dbPath, const std::string& hiveName); void InsertIntoHives(const std::string& hiveName);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Update database // Update database
void UpdateFavoriteColumn(const std::string& dbPath, const std::string& filename, int value); void UpdateFavoriteColumn(const std::string& filename, int value);
void UpdateHive(const std::string& dbPath, const std::string& hiveOldName, const std::string& hiveNewName); void UpdateHive(const std::string& hiveOldName, const std::string& hiveNewName);
void UpdateHiveName(const std::string& dbPath, const std::string& filename, const std::string& hiveName); void UpdateHiveName(const std::string& filename, const std::string& hiveName);
void UpdateTrashColumn(const std::string& dbPath, const std::string& filename, int value); void UpdateTrashColumn(const std::string& filename, int value);
void UpdateSamplePack(const std::string& dbPath, const std::string& filename, const std::string& samplePack); void UpdateSamplePack(const std::string& filename, const std::string& samplePack);
void UpdateSampleType(const std::string& dbPath, const std::string& filename, const std::string& type); void UpdateSampleType(const std::string& filename, const std::string& type);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Get from database // Get from database
int GetFavoriteColumnValueByFilename(const std::string& dbPath, const std::string& filename); int GetFavoriteColumnValueByFilename(const std::string& filename);
std::string GetHiveByFilename(const std::string& dbPath, const std::string& filename); std::string GetHiveByFilename(const std::string& filename);
std::string GetSamplePathByFilename(const std::string& dbPath, const std::string& filename); std::string GetSamplePathByFilename(const std::string& filename);
std::string GetSampleFileExtension(const std::string& dbPath, const std::string& filename); std::string GetSampleFileExtension(const std::string& filename);
std::string GetSampleType(const std::string& dbPath, const std::string& filename); std::string GetSampleType(const std::string& filename);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Check database // Check database
bool IsTrashed(const std::string& dbPath, const std::string& filename); bool IsTrashed(const std::string& filename);
wxArrayString CheckDuplicates(const std::string& dbPath, const wxArrayString& files); wxArrayString CheckDuplicates(const wxArrayString& files);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Remove from database // Remove from database
void RemoveSampleFromDatabase(const std::string& dbPath, const std::string& filename); void RemoveSampleFromDatabase(const std::string& filename);
void RemoveHiveFromDatabase(const std::string& dbPath, const std::string& hiveName); void RemoveHiveFromDatabase(const std::string& hiveName);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
wxVector<wxVector<wxVariant>>
// LoadDatabase(wxVector<wxVector<wxVariant>> &vecSet, // LoadDatabase(wxVector<wxVector<wxVariant>> &vecSet,
// wxTreeCtrl& favorite_tree, wxTreeItemId& favorite_item, // wxTreeCtrl& favorite_tree, wxTreeItemId& favorite_item,
// wxTreeCtrl& trash_tree, wxTreeItemId& trash_item, bool show_extension); // wxTreeCtrl& trash_tree, wxTreeItemId& trash_item, bool show_extension);
LoadSamplesDatabase(const std::string& dbPath, wxVector<wxVector<wxVariant>>& vecSet, wxVector<wxVector<wxVariant>>
wxDataViewTreeCtrl& favorite_tree, wxDataViewItem& favorite_item, LoadSamplesDatabase(wxDataViewTreeCtrl& favorite_tree, wxDataViewItem& favorite_item,
wxTreeCtrl& trash_tree, wxTreeItemId& trash_item, bool show_extension, wxTreeCtrl& trash_tree, wxTreeItemId& trash_item, bool show_extension,
const std::string& icon_star_filled, const std::string& icon_star_emtpy); const std::string& icon_star_filled, const std::string& icon_star_emtpy);
void LoadHivesDatabase(const std::string& dbPath, wxDataViewTreeCtrl& favorite_tree); void LoadHivesDatabase(wxDataViewTreeCtrl& favorite_tree);
wxVector<wxVector<wxVariant>> wxVector<wxVector<wxVariant>>
RestoreFromTrashByFilename(const std::string& dbPath, const std::string& filename, RestoreFromTrashByFilename(const std::string& filename,
wxVector<wxVector<wxVariant>>& vecSet, bool show_extension, wxVector<wxVector<wxVariant>>& vecSet, bool show_extension,
const std::string& icon_star_filled, const std::string& icon_star_empty); const std::string& icon_star_filled, const std::string& icon_star_empty);
wxVector<wxVector<wxVariant>> wxVector<wxVector<wxVariant>>
FilterDatabaseBySampleName(const std::string& dbPath, wxVector<wxVector<wxVariant>>& sampleVec, FilterDatabaseBySampleName(const std::string& sampleName, bool show_extension,
const std::string& sampleName, bool show_extension,
const std::string& icon_star_filled, const std::string& icon_star_empty); const std::string& icon_star_filled, const std::string& icon_star_empty);
wxVector<wxVector<wxVariant>> wxVector<wxVector<wxVariant>>
FilterDatabaseByHiveName(const std::string& dbPath, wxVector<wxVector<wxVariant>>& sampleVec, FilterDatabaseByHiveName(const std::string& hiveName, bool show_extension,
const std::string& hiveName, bool show_extension,
const std::string& icon_star_filled, const std::string& icon_star_empty); const std::string& icon_star_filled, const std::string& icon_star_empty);
}; };

237
src/MainFrame.cpp
View File

@ -398,7 +398,12 @@ MainFrame::MainFrame()
// Intializing wxTimer // Intializing wxTimer
m_Timer = new wxTimer(this); m_Timer = new wxTimer(this);
m_TopWaveformPanel = new WaveformViewer(this, m_TopPanel, *m_Library, *m_MediaCtrl, *m_InfoBar, // Initialize the database
m_database = std::make_unique<Database>(*m_InfoBar, m_DatabaseFilepath);
m_database->CreateTableSamples();
m_database->CreateTableHives();
m_TopWaveformPanel = new WaveformViewer(this, m_TopPanel, *m_Library, *m_MediaCtrl, *m_database,
m_ConfigFilepath, m_DatabaseFilepath); m_ConfigFilepath, m_DatabaseFilepath);
// Binding events. // Binding events.
@ -543,11 +548,6 @@ MainFrame::MainFrame()
m_BottomRightPanelMainSizer->SetSizeHints(m_BottomRightPanel); m_BottomRightPanelMainSizer->SetSizeHints(m_BottomRightPanel);
m_BottomRightPanelMainSizer->Layout(); m_BottomRightPanelMainSizer->Layout();
// Initialize the database
Database db(*m_InfoBar);
db.CreateTableSamples(static_cast<std::string>(DATABASE_FILEPATH));
db.CreateTableHives(static_cast<std::string>(DATABASE_FILEPATH));
// Restore the data previously added to Library // Restore the data previously added to Library
LoadDatabase(); LoadDatabase();
@ -582,7 +582,6 @@ void MainFrame::OnClickSettings(wxCommandEvent& event)
void MainFrame::AddSamples(wxArrayString& files) void MainFrame::AddSamples(wxArrayString& files)
{ {
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar);
wxBusyCursor busy_cursor; wxBusyCursor busy_cursor;
wxWindowDisabler window_disabler; wxWindowDisabler window_disabler;
@ -605,7 +604,7 @@ void MainFrame::AddSamples(wxArrayString& files)
//Check All Files At Once //Check All Files At Once
wxArrayString sorted_files; wxArrayString sorted_files;
sorted_files = db.CheckDuplicates(static_cast<std::string>(DATABASE_FILEPATH), files); sorted_files = m_database->CheckDuplicates(files);
files = sorted_files; files = sorted_files;
if(files.size() < 1) if(files.size() < 1)
@ -686,7 +685,7 @@ void MainFrame::AddSamples(wxArrayString& files)
progressDialog->Pulse(_("Updating Database.."), NULL); progressDialog->Pulse(_("Updating Database.."), NULL);
db.InsertIntoSamples(static_cast<std::string>(DATABASE_FILEPATH), sample_array); m_database->InsertIntoSamples(sample_array);
progressDialog->Destroy(); progressDialog->Destroy();
} }
@ -750,7 +749,6 @@ void MainFrame::OnDragAndDropToLibrary(wxDropFilesEvent& event)
void MainFrame::OnDragAndDropToHives(wxDropFilesEvent& event) void MainFrame::OnDragAndDropToHives(wxDropFilesEvent& event)
{ {
Database db(*m_InfoBar);
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
if (event.GetNumberOfFiles() > 0) if (event.GetNumberOfFiles() > 0)
@ -787,27 +785,23 @@ void MainFrame::OnDragAndDropToHives(wxDropFilesEvent& event)
rows - i, files[i], m_Hives->GetItemText(drop_target)); rows - i, files[i], m_Hives->GetItemText(drop_target));
if (drop_target.IsOk() && m_Hives->IsContainer(drop_target) && if (drop_target.IsOk() && m_Hives->IsContainer(drop_target) &&
db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), m_database->GetFavoriteColumnValueByFilename(file_name.ToStdString()) == 0)
file_name.ToStdString()) == 0)
{ {
m_Hives->AppendItem(drop_target, files[i]); m_Hives->AppendItem(drop_target, files[i]);
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), file_name.ToStdString(), 1); m_database->UpdateFavoriteColumn(file_name.ToStdString(), 1);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), m_database->UpdateHiveName( file_name.ToStdString(), hive_name.ToStdString());
file_name.ToStdString(), hive_name.ToStdString());
msg = wxString::Format(_("%s added to %s."), files[i], hive_name); msg = wxString::Format(_("%s added to %s."), files[i], hive_name);
} }
else else
{ {
if (db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), if (m_database->GetFavoriteColumnValueByFilename(file_name.ToStdString()) == 1)
file_name.ToStdString()) == 1)
{ {
wxMessageBox(wxString::Format(_("%s is already added to %s hive"), files[i], wxMessageBox(wxString::Format(_("%s is already added to %s hive"), files[i],
db.GetHiveByFilename(static_cast<std::string>(DATABASE_FILEPATH), m_database->GetHiveByFilename(file_name.ToStdString())),
file_name.ToStdString())),
_("Error!"), wxOK | wxICON_ERROR | wxCENTRE, this); _("Error!"), wxOK | wxICON_ERROR | wxCENTRE, this);
} }
else else
@ -901,20 +895,19 @@ void MainFrame::OnDragFromDirCtrl(wxTreeEvent& event)
void MainFrame::OnDragFromLibrary(wxDataViewEvent& event) void MainFrame::OnDragFromLibrary(wxDataViewEvent& event)
{ {
// Settings settings(m_ConfigFilepath, m_DatabaseFilepath); // Settings settings(m_ConfigFilepath, m_DatabaseFilepath);
// Database db(*m_InfoBar); //
int selected_row = m_Library->ItemToRow(event.GetItem()); int selected_row = m_Library->ItemToRow(event.GetItem());
if (selected_row < 0) return; if (selected_row < 0) return;
wxString selection = m_Library->GetTextValue(selected_row, 1); wxString selection = m_Library->GetTextValue(selected_row, 1);
// wxString sample_with_extension = db.GetSamplePathByFilename(selection.BeforeLast('.').ToStdString()); // wxString sample_with_extension = m_database->GetSamplePathByFilename(selection.BeforeLast('.').ToStdString());
// wxString sample_without_extension = db.GetSamplePathByFilename(selection.ToStdString()); // wxString sample_without_extension = m_database->GetSamplePathByFilename(selection.ToStdString());
// std::string extension = settings.ShouldShowFileExtension() ? // std::string extension = settings.ShouldShowFileExtension() ?
// db.GetSampleFileExtension(selection.ToStdString()) : // m_database->GetSampleFileExtension(selection.ToStdString()) :
// db.GetSampleFileExtension(selection.BeforeLast('.').ToStdString()); // m_database->GetSampleFileExtension(selection.BeforeLast('.').ToStdString());
// wxString sample = selection.Contains(wxString::Format(".%s", extension)) ? // wxString sample = selection.Contains(wxString::Format(".%s", extension)) ?
// sample_with_extension : sample_without_extension; // sample_with_extension : sample_without_extension;
@ -934,8 +927,7 @@ void MainFrame::OnClickPlay(wxCommandEvent& event)
bStopped = false; bStopped = false;
// Settings settings(m_ConfigFilepath, m_DatabaseFilepath); // Settings settings(m_ConfigFilepath, m_DatabaseFilepath);
// Database db(*m_InfoBar); //
int selected_row = m_Library->GetSelectedRow(); int selected_row = m_Library->GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
@ -943,12 +935,12 @@ void MainFrame::OnClickPlay(wxCommandEvent& event)
wxString selection = m_Library->GetTextValue(selected_row, 1); wxString selection = m_Library->GetTextValue(selected_row, 1);
// wxString sample_with_extension = db.GetSamplePathByFilename(selection.BeforeLast('.').ToStdString()); // wxString sample_with_extension = m_database->GetSamplePathByFilename(selection.BeforeLast('.').ToStdString());
// wxString sample_without_extension = db.GetSamplePathByFilename(selection.ToStdString()); // wxString sample_without_extension = m_database->GetSamplePathByFilename(selection.ToStdString());
// std::string extension = settings.ShouldShowFileExtension() ? // std::string extension = settings.ShouldShowFileExtension() ?
// db.GetSampleFileExtension(selection.ToStdString()) : // m_database->GetSampleFileExtension(selection.ToStdString()) :
// db.GetSampleFileExtension(selection.BeforeLast('.').ToStdString()); // m_database->GetSampleFileExtension(selection.BeforeLast('.').ToStdString());
// wxString sample = selection.Contains(wxString::Format(".%s", extension)) ? // wxString sample = selection.Contains(wxString::Format(".%s", extension)) ?
// sample_with_extension : sample_without_extension; // sample_with_extension : sample_without_extension;
@ -1091,9 +1083,7 @@ void MainFrame::OnReleaseVolumeSlider(wxScrollEvent& event)
void MainFrame::OnClickLibrary(wxDataViewEvent& event) void MainFrame::OnClickLibrary(wxDataViewEvent& event)
{ {
Settings settings(m_ConfigFilepath, m_DatabaseFilepath); Settings settings(m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); int selected_row = m_Library->ItemToRow(event.GetItem());
int selected_row = m_Library->ItemToRow(event.GetItem());
int current_row = m_Library->ItemToRow(m_Library->GetCurrentItem()); int current_row = m_Library->ItemToRow(m_Library->GetCurrentItem());
@ -1139,12 +1129,12 @@ void MainFrame::OnClickLibrary(wxDataViewEvent& event)
// else // else
// selection = m_Library->GetTextValue(selected_row, 1); // selection = m_Library->GetTextValue(selected_row, 1);
// wxString sample_with_extension = db.GetSamplePathByFilename(selection.BeforeLast('.').ToStdString()); // wxString sample_with_extension = m_database->GetSamplePathByFilename(selection.BeforeLast('.').ToStdString());
// wxString sample_without_extension = db.GetSamplePathByFilename(selection.ToStdString()); // wxString sample_without_extension = m_database->GetSamplePathByFilename(selection.ToStdString());
// std::string extension = settings.ShouldShowFileExtension() ? // std::string extension = settings.ShouldShowFileExtension() ?
// db.GetSampleFileExtension(selection.ToStdString()) : // m_database->GetSampleFileExtension(selection.ToStdString()) :
// db.GetSampleFileExtension(selection.BeforeLast('.').ToStdString()); // m_database->GetSampleFileExtension(selection.BeforeLast('.').ToStdString());
// wxString sample = selection.Contains(wxString::Format(".%s", extension)) ? // wxString sample = selection.Contains(wxString::Format(".%s", extension)) ?
// sample_with_extension : sample_without_extension; // sample_with_extension : sample_without_extension;
@ -1187,12 +1177,12 @@ void MainFrame::OnClickLibrary(wxDataViewEvent& event)
wxDataViewItem container; wxDataViewItem container;
wxDataViewItem child; wxDataViewItem child;
if (db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), filename) == 0) if (m_database->GetFavoriteColumnValueByFilename(filename) == 0)
{ {
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), selected_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), selected_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), filename, 1); m_database->UpdateFavoriteColumn(filename, 1);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), filename, hive_name); m_database->UpdateHiveName(filename, hive_name);
for (int i = 0; i < m_Hives->GetChildCount(root); i++) for (int i = 0; i < m_Hives->GetChildCount(root); i++)
{ {
@ -1211,9 +1201,8 @@ void MainFrame::OnClickLibrary(wxDataViewEvent& event)
{ {
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), selected_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), selected_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), filename, 0); m_database->UpdateFavoriteColumn(filename, 0);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), m_database->UpdateHiveName(filename, m_Hives->GetItemText(favorites_hive).ToStdString());
filename, m_Hives->GetItemText(favorites_hive).ToStdString());
for (int i = 0; i < m_Hives->GetChildCount(root); i++) for (int i = 0; i < m_Hives->GetChildCount(root); i++)
{ {
@ -1242,9 +1231,7 @@ void MainFrame::OnClickLibrary(wxDataViewEvent& event)
void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event) void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
{ {
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); wxDataViewItem selected_hive = event.GetItem();
wxDataViewItem selected_hive = event.GetItem();
wxString hive_name = m_Hives->GetItemText(selected_hive); wxString hive_name = m_Hives->GetItemText(selected_hive);
@ -1342,8 +1329,7 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
wxLogDebug("Sample count: %d", sample_count); wxLogDebug("Sample count: %d", sample_count);
m_Hives->SetItemText(selected_hive, hive_name); m_Hives->SetItemText(selected_hive, hive_name);
db.UpdateHive(static_cast<std::string>(DATABASE_FILEPATH), m_database->UpdateHive(selected_hive_name.ToStdString(), hive_name.ToStdString());
selected_hive_name.ToStdString(), hive_name.ToStdString());
} }
else else
{ {
@ -1357,10 +1343,8 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
wxLogDebug("Sample count: %d :: Sample name: %s", sample_count, sample_name); wxLogDebug("Sample count: %d :: Sample name: %s", sample_count, sample_name);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), m_database->UpdateHiveName(sample_name.ToStdString(), hive_name.ToStdString());
sample_name.ToStdString(), hive_name.ToStdString()); m_database->UpdateHive(selected_hive_name.ToStdString(), hive_name.ToStdString());
db.UpdateHive(static_cast<std::string>(DATABASE_FILEPATH),
selected_hive_name.ToStdString(), hive_name.ToStdString());
m_Hives->SetItemText(selected_hive, hive_name); m_Hives->SetItemText(selected_hive, hive_name);
} }
@ -1429,8 +1413,7 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
{ {
m_Hives->DeleteItem(selected_hive); m_Hives->DeleteItem(selected_hive);
db.RemoveHiveFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), m_database->RemoveHiveFromDatabase(hive_name.ToStdString());
hive_name.ToStdString());
msg = wxString::Format(_("%s deleted from hives successfully."), hive_name); msg = wxString::Format(_("%s deleted from hives successfully."), hive_name);
} }
@ -1471,11 +1454,8 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), m_database->UpdateFavoriteColumn(matched_sample.ToStdString(), 0);
matched_sample.ToStdString(), 0); m_database->UpdateHiveName(matched_sample.ToStdString(), m_Hives->GetItemText(favorites_hive).ToStdString());
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH),
matched_sample.ToStdString(),
m_Hives->GetItemText(favorites_hive).ToStdString());
break; break;
} }
@ -1487,8 +1467,7 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
m_Hives->DeleteChildren(selected_hive); m_Hives->DeleteChildren(selected_hive);
m_Hives->DeleteItem(selected_hive); m_Hives->DeleteItem(selected_hive);
db.RemoveHiveFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), m_database->RemoveHiveFromDatabase(hive_name.ToStdString());
hive_name.ToStdString());
msg = wxString::Format( msg = wxString::Format(
_("%s and all samples inside %s have been deleted from hives successfully."), _("%s and all samples inside %s have been deleted from hives successfully."),
@ -1512,12 +1491,11 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
{ {
try try
{ {
wxVector<wxVector<wxVariant>> dataset; const auto dataset = m_database->FilterDatabaseByHiveName(hive_name.ToStdString(),
if (db.FilterDatabaseByHiveName(static_cast<std::string>(DATABASE_FILEPATH),
dataset, hive_name.ToStdString(),
settings.ShouldShowFileExtension(), settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty()) ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px);
if (dataset.empty())
{ {
wxMessageBox(_("Error! Database is empty."), _("Error!"), wxMessageBox(_("Error! Database is empty."), _("Error!"),
wxOK | wxICON_ERROR | wxCENTRE, this); wxOK | wxICON_ERROR | wxCENTRE, this);
@ -1547,11 +1525,10 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
{ {
try try
{ {
wxVector<wxVector<wxVariant>> dataset; const auto dataset = m_database->FilterDatabaseBySampleName("", settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px);
if (db.FilterDatabaseBySampleName(static_cast<std::string>(DATABASE_FILEPATH), if (dataset.empty())
dataset, "", settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty())
{ {
wxMessageBox(_("Error! Database is empty."), _("Error!"), wxMessageBox(_("Error! Database is empty."), _("Error!"),
wxOK | wxICON_ERROR | wxCENTRE, this); wxOK | wxICON_ERROR | wxCENTRE, this);
@ -1601,8 +1578,8 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), matched_sample.ToStdString(), 0); m_database->UpdateFavoriteColumn(matched_sample.ToStdString(), 0);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), matched_sample.ToStdString(), m_database->UpdateHiveName(matched_sample.ToStdString(),
m_Hives->GetItemText(favorites_hive).ToStdString()); m_Hives->GetItemText(favorites_hive).ToStdString());
m_Hives->DeleteItem(selected_hive); m_Hives->DeleteItem(selected_hive);
@ -1612,8 +1589,7 @@ void MainFrame::OnShowHivesContextMenu(wxDataViewEvent& event)
m_InfoBar->ShowMessage(wxString::Format(_("Removed %s from %s"), m_InfoBar->ShowMessage(wxString::Format(_("Removed %s from %s"),
m_Hives->GetItemText(event.GetItem()), m_Hives->GetItemText(event.GetItem()),
db.GetHiveByFilename(static_cast<std::string>(DATABASE_FILEPATH), m_database->GetHiveByFilename(matched_sample.ToStdString())),
matched_sample.ToStdString())),
wxICON_INFORMATION); wxICON_INFORMATION);
} }
break; break;
@ -1652,9 +1628,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
{ {
TagEditor* tagEditor; TagEditor* tagEditor;
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); wxString msg;
wxString msg;
wxDataViewItem item = event.GetItem(); wxDataViewItem item = event.GetItem();
int selected_row; int selected_row;
@ -1675,7 +1649,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
//true = add false = remove //true = add false = remove
bool favorite_add = false; bool favorite_add = false;
if (db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), filename) == 1) if (m_database->GetFavoriteColumnValueByFilename(filename) == 1)
menu.Append(MN_FavoriteSample, _("Remove from hive"), _("Remove the selected sample(s) from hive")); menu.Append(MN_FavoriteSample, _("Remove from hive"), _("Remove the selected sample(s) from hive"));
else else
{ {
@ -1729,7 +1703,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
filename = settings.ShouldShowFileExtension() ? filename = settings.ShouldShowFileExtension() ?
name.BeforeLast('.').ToStdString() : name.ToStdString(); name.BeforeLast('.').ToStdString() : name.ToStdString();
db_status = db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), filename); db_status = m_database->GetFavoriteColumnValueByFilename(filename);
// Aleady Added, Do Nothing // Aleady Added, Do Nothing
if (favorite_add && db_status == 1) if (favorite_add && db_status == 1)
@ -1744,8 +1718,8 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
{ {
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), selected_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_FILLED_16px)), selected_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), filename, 1); m_database->UpdateFavoriteColumn(filename, 1);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), filename, hive_name); m_database->UpdateHiveName(filename, hive_name);
for (int i = 0; i < m_Hives->GetChildCount(root); i++) for (int i = 0; i < m_Hives->GetChildCount(root); i++)
{ {
@ -1765,8 +1739,8 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
//Remove From Favorites //Remove From Favorites
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), selected_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), selected_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), filename, 0); m_database->UpdateFavoriteColumn(filename, 0);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), filename, m_database->UpdateHiveName(filename,
m_Hives->GetItemText(favorites_hive).ToStdString()); m_Hives->GetItemText(favorites_hive).ToStdString());
for (int i = 0; i < m_Hives->GetChildCount(root); i++) for (int i = 0; i < m_Hives->GetChildCount(root); i++)
@ -1829,7 +1803,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
{ {
wxLogDebug("Selected row: %d :: Sample: %s", selected_row, filename); wxLogDebug("Selected row: %d :: Sample: %s", selected_row, filename);
db.RemoveSampleFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), filename); m_database->RemoveSampleFromDatabase(filename);
m_Library->DeleteItem(selected_row); m_Library->DeleteItem(selected_row);
for (int j = 0; j < m_Hives->GetChildCount(root); j++) for (int j = 0; j < m_Hives->GetChildCount(root); j++)
@ -1879,7 +1853,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
std::string multi_selection = settings.ShouldShowFileExtension() ? std::string multi_selection = settings.ShouldShowFileExtension() ?
text_value.BeforeLast('.').ToStdString() : text_value.ToStdString() ; text_value.BeforeLast('.').ToStdString() : text_value.ToStdString() ;
db.RemoveSampleFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), multi_selection); m_database->RemoveSampleFromDatabase(multi_selection);
m_Library->DeleteItem(row); m_Library->DeleteItem(row);
for (int j = 0; j < m_Hives->GetChildCount(root); j++) for (int j = 0; j < m_Hives->GetChildCount(root); j++)
@ -1921,7 +1895,7 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
wxDataViewItem root = wxDataViewItem(wxNullPtr); wxDataViewItem root = wxDataViewItem(wxNullPtr);
wxDataViewItem container, child; wxDataViewItem container, child;
if (db.IsTrashed(static_cast<std::string>(DATABASE_FILEPATH), filename)) if (m_database->IsTrashed(filename))
wxLogDebug(_("Already trashed..")); wxLogDebug(_("Already trashed.."));
else else
{ {
@ -1946,11 +1920,11 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
files = file_data.GetFilenames(); files = file_data.GetFilenames();
if (db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString())) if (m_database->GetFavoriteColumnValueByFilename(files[i].ToStdString()))
{ {
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), item_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), item_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 0); m_database->UpdateFavoriteColumn(files[i].ToStdString(), 0);
for (int j = 0; j < m_Hives->GetChildCount(root); j++) for (int j = 0; j < m_Hives->GetChildCount(root); j++)
{ {
@ -1973,8 +1947,8 @@ void MainFrame::OnShowLibraryContextMenu(wxDataViewEvent& event)
} }
} }
db.UpdateTrashColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 1); m_database->UpdateTrashColumn(files[i].ToStdString(), 1);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), m_database->UpdateHiveName(files[i].ToStdString(),
m_Hives->GetItemText(favorites_hive).ToStdString()); m_Hives->GetItemText(favorites_hive).ToStdString());
m_Trash->AppendItem(trash_root, text_value); m_Trash->AppendItem(trash_root, text_value);
@ -2081,17 +2055,15 @@ void MainFrame::OnShowLibraryColumnHeaderContextMenu(wxDataViewEvent& event)
void MainFrame::LoadDatabase() void MainFrame::LoadDatabase()
{ {
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); try
try
{ {
db.LoadHivesDatabase(static_cast<std::string>(DATABASE_FILEPATH), *m_Hives); m_database->LoadHivesDatabase(*m_Hives);
wxVector<wxVector<wxVariant>> dataset; const auto dataset = m_database->LoadSamplesDatabase(*m_Hives, favorites_hive,
if (db.LoadSamplesDatabase(static_cast<std::string>(DATABASE_FILEPATH), dataset, *m_Hives, favorites_hive,
*m_Trash, trash_root, settings.ShouldShowFileExtension(), *m_Trash, trash_root, settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty()) ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px);
if (dataset.empty())
{ {
wxLogInfo(_("Error! Database is empty.")); wxLogInfo(_("Error! Database is empty."));
} }
@ -2112,9 +2084,7 @@ void MainFrame::LoadDatabase()
void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event) void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
{ {
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); wxTreeItemId selected_trashed_item = event.GetItem();
wxTreeItemId selected_trashed_item = event.GetItem();
wxMenu menu; wxMenu menu;
@ -2133,7 +2103,7 @@ void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
m_Trash->GetItemText(selected_trashed_item).BeforeLast('.') : m_Trash->GetItemText(selected_trashed_item).BeforeLast('.') :
m_Trash->GetItemText(selected_trashed_item); m_Trash->GetItemText(selected_trashed_item);
db.RemoveSampleFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), trashed_item_name.ToStdString()); m_database->RemoveSampleFromDatabase(trashed_item_name.ToStdString());
m_Trash->Delete(selected_trashed_item); m_Trash->Delete(selected_trashed_item);
} }
@ -2142,9 +2112,7 @@ void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
{ {
wxLogDebug(_("Restore sample")); wxLogDebug(_("Restore sample"));
Database db(*m_InfoBar); wxArrayTreeItemIds selected_item_ids;
wxArrayTreeItemIds selected_item_ids;
m_Trash->GetSelections(selected_item_ids); m_Trash->GetSelections(selected_item_ids);
wxFileDataObject file_data; wxFileDataObject file_data;
@ -2166,13 +2134,13 @@ void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
files = file_data.GetFilenames(); files = file_data.GetFilenames();
db.UpdateTrashColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 0); m_database->UpdateTrashColumn(files[i].ToStdString(), 0);
try try
{ {
wxVector<wxVector<wxVariant>> dataset; wxVector<wxVector<wxVariant>> dataset;
if (db.RestoreFromTrashByFilename(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), if (m_database->RestoreFromTrashByFilename(files[i].ToStdString(),
dataset, settings.ShouldShowFileExtension(), dataset, settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty()) ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty())
{ {
@ -2203,7 +2171,6 @@ void MainFrame::OnShowTrashContextMenu(wxTreeEvent& event)
void MainFrame::OnDragAndDropToTrash(wxDropFilesEvent& event) void MainFrame::OnDragAndDropToTrash(wxDropFilesEvent& event)
{ {
Database db(*m_InfoBar);
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
if (event.GetNumberOfFiles() > 0) if (event.GetNumberOfFiles() > 0)
@ -2233,11 +2200,11 @@ void MainFrame::OnDragAndDropToTrash(wxDropFilesEvent& event)
files = file_data.GetFilenames(); files = file_data.GetFilenames();
if (db.GetFavoriteColumnValueByFilename(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString())) if (m_database->GetFavoriteColumnValueByFilename(files[i].ToStdString()))
{ {
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), item_row, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), item_row, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 0); m_database->UpdateFavoriteColumn(files[i].ToStdString(), 0);
for (int j = 0; j < m_Hives->GetChildCount(root); j++) for (int j = 0; j < m_Hives->GetChildCount(root); j++)
{ {
@ -2260,8 +2227,8 @@ void MainFrame::OnDragAndDropToTrash(wxDropFilesEvent& event)
} }
} }
db.UpdateTrashColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 1); m_database->UpdateTrashColumn(files[i].ToStdString(), 1);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), m_database->UpdateHiveName(files[i].ToStdString(),
m_Hives->GetItemText(favorites_hive).ToStdString()); m_Hives->GetItemText(favorites_hive).ToStdString());
m_Trash->AppendItem(trash_root, text_value); m_Trash->AppendItem(trash_root, text_value);
@ -2278,9 +2245,7 @@ void MainFrame::OnDragAndDropToTrash(wxDropFilesEvent& event)
void MainFrame::OnClickAddHive(wxCommandEvent& event) void MainFrame::OnClickAddHive(wxCommandEvent& event)
{ {
Database db(*m_InfoBar); std::deque<wxDataViewItem> nodes;
std::deque<wxDataViewItem> nodes;
nodes.push_back(m_Hives->GetNthChild(wxDataViewItem(wxNullPtr), 0)); nodes.push_back(m_Hives->GetNthChild(wxDataViewItem(wxNullPtr), 0));
wxDataViewItem current_item, found_item; wxDataViewItem current_item, found_item;
@ -2341,7 +2306,7 @@ void MainFrame::OnClickAddHive(wxCommandEvent& event)
else else
{ {
m_Hives->AppendContainer(wxDataViewItem(wxNullPtr), hive_name); m_Hives->AppendContainer(wxDataViewItem(wxNullPtr), hive_name);
db.InsertIntoHives(static_cast<std::string>(DATABASE_FILEPATH), hive_name.ToStdString()); m_database->InsertIntoHives(hive_name.ToStdString());
msg = wxString::Format(_("%s added to Hives."), hive_name); msg = wxString::Format(_("%s added to Hives."), hive_name);
} }
@ -2360,9 +2325,7 @@ void MainFrame::OnClickAddHive(wxCommandEvent& event)
void MainFrame::OnClickRemoveHive(wxCommandEvent& event) void MainFrame::OnClickRemoveHive(wxCommandEvent& event)
{ {
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
Database db(*m_InfoBar); wxDataViewItem selected_item = m_Hives->GetSelection();
wxDataViewItem selected_item = m_Hives->GetSelection();
wxString hive_name = m_Hives->GetItemText(selected_item); wxString hive_name = m_Hives->GetItemText(selected_item);
wxString msg; wxString msg;
@ -2411,7 +2374,7 @@ void MainFrame::OnClickRemoveHive(wxCommandEvent& event)
{ {
m_Hives->DeleteItem(selected_item); m_Hives->DeleteItem(selected_item);
db.RemoveHiveFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), hive_name.ToStdString()); m_database->RemoveHiveFromDatabase(hive_name.ToStdString());
msg = wxString::Format(_("%s deleted from hives successfully."), hive_name); msg = wxString::Format(_("%s deleted from hives successfully."), hive_name);
} }
break; break;
@ -2451,8 +2414,8 @@ void MainFrame::OnClickRemoveHive(wxCommandEvent& event)
m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0); m_Library->SetValue(wxVariant(wxBitmap(ICON_STAR_EMPTY_16px)), i, 0);
db.UpdateFavoriteColumn(static_cast<std::string>(DATABASE_FILEPATH), matched_sample.ToStdString(), 0); m_database->UpdateFavoriteColumn(matched_sample.ToStdString(), 0);
db.UpdateHiveName(static_cast<std::string>(DATABASE_FILEPATH), matched_sample.ToStdString(), m_database->UpdateHiveName(matched_sample.ToStdString(),
m_Hives->GetItemText(favorites_hive).ToStdString()); m_Hives->GetItemText(favorites_hive).ToStdString());
break; break;
@ -2465,7 +2428,7 @@ void MainFrame::OnClickRemoveHive(wxCommandEvent& event)
m_Hives->DeleteChildren(selected_item); m_Hives->DeleteChildren(selected_item);
m_Hives->DeleteItem(selected_item); m_Hives->DeleteItem(selected_item);
db.RemoveHiveFromDatabase(static_cast<std::string>(DATABASE_FILEPATH), hive_name.ToStdString()); m_database->RemoveHiveFromDatabase(hive_name.ToStdString());
msg = wxString::Format(_("%s and all samples inside %s have been deleted from hives successfully."), msg = wxString::Format(_("%s and all samples inside %s have been deleted from hives successfully."),
hive_name, hive_name); hive_name, hive_name);
@ -2484,7 +2447,6 @@ void MainFrame::OnClickRemoveHive(wxCommandEvent& event)
void MainFrame::OnClickRestoreTrashItem(wxCommandEvent& event) void MainFrame::OnClickRestoreTrashItem(wxCommandEvent& event)
{ {
Database db(*m_InfoBar);
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
wxArrayTreeItemIds selected_item_ids; wxArrayTreeItemIds selected_item_ids;
@ -2521,13 +2483,13 @@ void MainFrame::OnClickRestoreTrashItem(wxCommandEvent& event)
files = file_data.GetFilenames(); files = file_data.GetFilenames();
db.UpdateTrashColumn(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), 0); m_database->UpdateTrashColumn(files[i].ToStdString(), 0);
try try
{ {
wxVector<wxVector<wxVariant>> dataset; wxVector<wxVector<wxVariant>> dataset;
if (db.RestoreFromTrashByFilename(static_cast<std::string>(DATABASE_FILEPATH), files[i].ToStdString(), dataset, if (m_database->RestoreFromTrashByFilename(files[i].ToStdString(), dataset,
settings.ShouldShowFileExtension(), settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty()) ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty())
{ {
@ -2552,17 +2514,16 @@ void MainFrame::OnClickRestoreTrashItem(wxCommandEvent& event)
void MainFrame::OnDoSearch(wxCommandEvent& event) void MainFrame::OnDoSearch(wxCommandEvent& event)
{ {
Database db(*m_InfoBar);
Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this, m_ConfigFilepath, m_DatabaseFilepath);
std::string search = m_SearchBox->GetValue().ToStdString(); const auto search = m_SearchBox->GetValue().ToStdString();
try try
{ {
wxVector<wxVector<wxVariant>> dataset; const auto dataset = m_database->FilterDatabaseBySampleName(search, settings.ShouldShowFileExtension(),
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px);
if (db.FilterDatabaseBySampleName(static_cast<std::string>(DATABASE_FILEPATH), dataset, search, settings.ShouldShowFileExtension(), if (dataset.empty())
ICON_STAR_FILLED_16px, ICON_STAR_EMPTY_16px).empty())
{ {
wxLogDebug(_("Error! Database is empty.")); wxLogDebug(_("Error! Database is empty."));
} }
@ -2572,7 +2533,7 @@ void MainFrame::OnDoSearch(wxCommandEvent& event)
std::cout << search << std::endl; std::cout << search << std::endl;
for (auto data : dataset) for (const auto& data : dataset)
{ {
m_Library->AppendItem(data); m_Library->AppendItem(data);
} }
@ -2685,21 +2646,19 @@ void MainFrame::RefreshDatabase()
FileInfo FileInfo
MainFrame::GetFilenamePathAndExtension(const wxString& selected, bool checkExtension, bool doGetFilename) const MainFrame::GetFilenamePathAndExtension(const wxString& selected, bool checkExtension, bool doGetFilename) const
{ {
Database db(*m_InfoBar);
Settings settings(m_ConfigFilepath, m_DatabaseFilepath); Settings settings(m_ConfigFilepath, m_DatabaseFilepath);
wxString path; wxString path;
std::string extension, filename; std::string extension, filename;
wxString filename_with_extension = db.GetSamplePathByFilename(static_cast<std::string>(DATABASE_FILEPATH), wxString filename_with_extension = m_database->GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
selected.BeforeLast('.').ToStdString()); wxString filename_without_extension = m_database->GetSamplePathByFilename(selected.ToStdString());
wxString filename_without_extension = db.GetSamplePathByFilename(static_cast<std::string>(DATABASE_FILEPATH), selected.ToStdString());
if (checkExtension) if (checkExtension)
{ {
extension = settings.ShouldShowFileExtension() ? extension = settings.ShouldShowFileExtension() ?
db.GetSampleFileExtension(static_cast<std::string>(DATABASE_FILEPATH), selected.ToStdString()) : m_database->GetSampleFileExtension(selected.ToStdString()) :
db.GetSampleFileExtension(static_cast<std::string>(DATABASE_FILEPATH), selected.BeforeLast('.').ToStdString()); m_database->GetSampleFileExtension(selected.BeforeLast('.').ToStdString());
} }
path = selected.Contains(wxString::Format(".%s", extension)) ? path = selected.Contains(wxString::Format(".%s", extension)) ?

4
src/MainFrame.hpp
View File

@ -24,6 +24,7 @@
#include "SampleHiveConfig.hpp" #include "SampleHiveConfig.hpp"
#include "SH_Event.hpp" #include "SH_Event.hpp"
#include <memory>
#include <string> #include <string>
#include <wx/button.h> #include <wx/button.h>
@ -65,6 +66,8 @@
#include <taglib/tstring.h> #include <taglib/tstring.h>
#endif #endif
#include "Database.hpp"
struct FileInfo struct FileInfo
{ {
wxString Path; wxString Path;
@ -180,6 +183,7 @@ class MainFrame : public wxFrame
// ------------------------------------------------------------------- // -------------------------------------------------------------------
wxSystemAppearance m_Theme = wxSystemSettings::GetAppearance(); wxSystemAppearance m_Theme = wxSystemSettings::GetAppearance();
std::unique_ptr<Database> m_database;
private: private:
// ------------------------------------------------------------------- // -------------------------------------------------------------------
bool bAutoplay = false; bool bAutoplay = false;

8
src/TagEditorDialog.cpp
View File

@ -226,7 +226,7 @@ void TagEditor::OnClickCustomTagButton(wxCommandEvent& event)
void TagEditor::OnClickApply(wxCommandEvent& event) void TagEditor::OnClickApply(wxCommandEvent& event)
{ {
Database db(m_InfoBar); Database db(m_InfoBar, m_DatabaseFilepath);
wxString title = m_TitleText->GetValue(); wxString title = m_TitleText->GetValue();
wxString artist = m_ArtistText->GetValue(); wxString artist = m_ArtistText->GetValue();
@ -235,7 +235,7 @@ void TagEditor::OnClickApply(wxCommandEvent& event)
wxString comment = m_CommentText->GetValue(); wxString comment = m_CommentText->GetValue();
wxString type = m_SampleTypeChoice->GetStringSelection(); wxString type = m_SampleTypeChoice->GetStringSelection();
std::string sampleType = db.GetSampleType(m_DatabaseFilepath, m_Filename); std::string sampleType = db.GetSampleType(m_Filename);
std::string filename = wxString(m_Filename).AfterLast('/').BeforeLast('.').ToStdString(); std::string filename = wxString(m_Filename).AfterLast('/').BeforeLast('.').ToStdString();
@ -265,7 +265,7 @@ void TagEditor::OnClickApply(wxCommandEvent& event)
wxLogDebug("Changing artist tag.."); wxLogDebug("Changing artist tag..");
tags.SetArtist(artist.ToStdString()); tags.SetArtist(artist.ToStdString());
db.UpdateSamplePack(m_DatabaseFilepath, m_Filename, artist.ToStdString()); db.UpdateSamplePack(m_Filename, artist.ToStdString());
wxLogDebug("SAMPLE FILENAME HERE: %s", m_Filename); wxLogDebug("SAMPLE FILENAME HERE: %s", m_Filename);
@ -299,7 +299,7 @@ void TagEditor::OnClickApply(wxCommandEvent& event)
if (m_SampleTypeCheck->GetValue() && m_SampleTypeChoice->GetStringSelection() != sampleType) if (m_SampleTypeCheck->GetValue() && m_SampleTypeChoice->GetStringSelection() != sampleType)
{ {
wxLogDebug("Changing type tag.."); wxLogDebug("Changing type tag..");
db.UpdateSampleType(m_DatabaseFilepath, filename, type.ToStdString()); db.UpdateSampleType(filename, type.ToStdString());
info_msg = wxString::Format("Successfully changed type tag to %s", type); info_msg = wxString::Format("Successfully changed type tag to %s", type);
} }

32
src/WaveformViewer.cpp
View File

@ -39,10 +39,10 @@
#include <sndfile.hh> #include <sndfile.hh>
WaveformViewer::WaveformViewer(wxWindow* parentFrame, wxWindow* window, wxDataViewListCtrl& library, WaveformViewer::WaveformViewer(wxWindow* parentFrame, wxWindow* window, wxDataViewListCtrl& library,
wxMediaCtrl& mediaCtrl, wxInfoBar& infoBar, wxMediaCtrl& mediaCtrl, Database& database,
const std::string& configFilepath, const std::string& databaseFilepath) const std::string& configFilepath, const std::string& databaseFilepath)
: wxPanel(window, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER | wxFULL_REPAINT_ON_RESIZE), : wxPanel(window, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxNO_BORDER | wxFULL_REPAINT_ON_RESIZE),
m_ParentFrame(parentFrame), m_Window(window), m_Library(library), m_InfoBar(infoBar), m_MediaCtrl(mediaCtrl), m_ParentFrame(parentFrame), m_Window(window), m_Library(library), m_database(database), m_MediaCtrl(mediaCtrl),
m_ConfigFilepath(configFilepath), m_DatabaseFilepath(databaseFilepath) m_ConfigFilepath(configFilepath), m_DatabaseFilepath(databaseFilepath)
{ {
this->SetDoubleBuffered(true); this->SetDoubleBuffered(true);
@ -110,15 +110,13 @@ void WaveformViewer::OnPaint(wxPaintEvent& event)
void WaveformViewer::RenderPlayhead(wxDC& dc) void WaveformViewer::RenderPlayhead(wxDC& dc)
{ {
Database db(m_InfoBar);
int selected_row = m_Library.GetSelectedRow(); int selected_row = m_Library.GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
return; return;
wxString selected = m_Library.GetTextValue(selected_row, 1); wxString selected = m_Library.GetTextValue(selected_row, 1);
std::string path = db.GetSamplePathByFilename(m_DatabaseFilepath, selected.BeforeLast('.').ToStdString()); std::string path = m_database.GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
Tags tags(path); Tags tags(path);
@ -150,7 +148,6 @@ void WaveformViewer::RenderPlayhead(wxDC& dc)
void WaveformViewer::UpdateWaveformBitmap() void WaveformViewer::UpdateWaveformBitmap()
{ {
Database db(m_InfoBar);
Settings settings(m_ParentFrame, m_ConfigFilepath, m_DatabaseFilepath); Settings settings(m_ParentFrame, m_ConfigFilepath, m_DatabaseFilepath);
Serializer serializer(m_ConfigFilepath); Serializer serializer(m_ConfigFilepath);
@ -161,12 +158,12 @@ void WaveformViewer::UpdateWaveformBitmap()
wxString selection = m_Library.GetTextValue(selected_row, 1); wxString selection = m_Library.GetTextValue(selected_row, 1);
wxString filepath_with_extension = db.GetSamplePathByFilename(m_DatabaseFilepath, selection.BeforeLast('.').ToStdString()); wxString filepath_with_extension = m_database.GetSamplePathByFilename(selection.BeforeLast('.').ToStdString());
wxString filepath_without_extension = db.GetSamplePathByFilename(m_DatabaseFilepath, selection.ToStdString()); wxString filepath_without_extension = m_database.GetSamplePathByFilename(selection.ToStdString());
std::string extension = settings.ShouldShowFileExtension() ? std::string extension = settings.ShouldShowFileExtension() ?
db.GetSampleFileExtension(m_DatabaseFilepath, selection.ToStdString()) : m_database.GetSampleFileExtension(selection.ToStdString()) :
db.GetSampleFileExtension(m_DatabaseFilepath, selection.BeforeLast('.').ToStdString()); m_database.GetSampleFileExtension(selection.BeforeLast('.').ToStdString());
wxString path = selection.Contains(wxString::Format(".%s", extension)) ? wxString path = selection.Contains(wxString::Format(".%s", extension)) ?
filepath_with_extension : filepath_without_extension; filepath_with_extension : filepath_without_extension;
@ -293,15 +290,13 @@ void WaveformViewer::OnControlKeyUp(wxKeyEvent &event)
void WaveformViewer::OnMouseMotion(wxMouseEvent& event) void WaveformViewer::OnMouseMotion(wxMouseEvent& event)
{ {
Database db(m_InfoBar);
int selected_row = m_Library.GetSelectedRow(); int selected_row = m_Library.GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
return; return;
wxString selected = m_Library.GetTextValue(selected_row, 1); wxString selected = m_Library.GetTextValue(selected_row, 1);
std::string path = db.GetSamplePathByFilename(m_DatabaseFilepath, selected.BeforeLast('.').ToStdString()); std::string path = m_database.GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
Tags tags(path); Tags tags(path);
@ -335,14 +330,13 @@ void WaveformViewer::OnMouseMotion(wxMouseEvent& event)
void WaveformViewer::OnMouseLeftButtonDown(wxMouseEvent& event) void WaveformViewer::OnMouseLeftButtonDown(wxMouseEvent& event)
{ {
Database db(m_InfoBar);
int selected_row = m_Library.GetSelectedRow(); int selected_row = m_Library.GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
return; return;
wxString selected = m_Library.GetTextValue(selected_row, 1); wxString selected = m_Library.GetTextValue(selected_row, 1);
std::string path = db.GetSamplePathByFilename(m_DatabaseFilepath, selected.BeforeLast('.').ToStdString()); std::string path = m_database.GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
Tags tags(path); Tags tags(path);
@ -385,15 +379,13 @@ void WaveformViewer::OnMouseLeftButtonDown(wxMouseEvent& event)
void WaveformViewer::OnMouseLeftButtonUp(wxMouseEvent& event) void WaveformViewer::OnMouseLeftButtonUp(wxMouseEvent& event)
{ {
Database db(m_InfoBar);
int selected_row = m_Library.GetSelectedRow(); int selected_row = m_Library.GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
return; return;
wxString selected = m_Library.GetTextValue(selected_row, 1); wxString selected = m_Library.GetTextValue(selected_row, 1);
std::string path = db.GetSamplePathByFilename(m_DatabaseFilepath, selected.BeforeLast('.').ToStdString()); std::string path = m_database.GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
Tags tags(path); Tags tags(path);
@ -457,15 +449,13 @@ void WaveformViewer::SendLoopPoints()
SampleHive::SH_LoopPointsEvent event(SampleHive::SH_EVT_LOOP_POINTS_UPDATED, this->GetId()); SampleHive::SH_LoopPointsEvent event(SampleHive::SH_EVT_LOOP_POINTS_UPDATED, this->GetId());
event.SetEventObject(this); event.SetEventObject(this);
Database db(m_InfoBar);
int selected_row = m_Library.GetSelectedRow(); int selected_row = m_Library.GetSelectedRow();
if (selected_row < 0) if (selected_row < 0)
return; return;
wxString selected = m_Library.GetTextValue(selected_row, 1); wxString selected = m_Library.GetTextValue(selected_row, 1);
std::string path = db.GetSamplePathByFilename(m_DatabaseFilepath, selected.BeforeLast('.').ToStdString()); std::string path = m_database.GetSamplePathByFilename(selected.BeforeLast('.').ToStdString());
Tags tags(path); Tags tags(path);

6
src/WaveformViewer.hpp
View File

@ -20,6 +20,8 @@
#pragma once #pragma once
#include "Database.hpp"
#include <wx/dataview.h> #include <wx/dataview.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/colour.h> #include <wx/colour.h>
@ -37,7 +39,7 @@ class WaveformViewer : public wxPanel
{ {
public: public:
WaveformViewer(wxWindow* parentFrame, wxWindow* window, wxDataViewListCtrl& library, WaveformViewer(wxWindow* parentFrame, wxWindow* window, wxDataViewListCtrl& library,
wxMediaCtrl& mediaCtrl, wxInfoBar& infoBar, wxMediaCtrl& mediaCtrl, Database& database,
const std::string& configFilepath, const std::string& databaseFilepath); const std::string& configFilepath, const std::string& databaseFilepath);
~WaveformViewer(); ~WaveformViewer();
@ -47,7 +49,7 @@ class WaveformViewer : public wxPanel
wxWindow* m_Window; wxWindow* m_Window;
wxDataViewListCtrl& m_Library; wxDataViewListCtrl& m_Library;
wxInfoBar& m_InfoBar; Database& m_database;
wxMediaCtrl& m_MediaCtrl; wxMediaCtrl& m_MediaCtrl;
const std::string& m_ConfigFilepath; const std::string& m_ConfigFilepath;

1
subprojects/wxwidgets.wrap
View File

@ -1,3 +1,4 @@
[wrap-git] [wrap-git]
url = https://github.com/wxWidgets/wxWidgets url = https://github.com/wxWidgets/wxWidgets
revision = master revision = master
clone-recursive = true