From 89928751808066761851ef82b7895e319ce7034d Mon Sep 17 00:00:00 2001 From: Kevin Whitaker Date: Wed, 22 Feb 2017 21:38:37 -0500 Subject: [PATCH] Fix a bug. Add some destructors. comment out one that causes problems. --- run.sh | 2 +- src/GroovePlayer.cpp | 5 +++-- src/ui/AdminInterface.cpp | 8 ++++++++ src/ui/AdminInterface.h | 1 + src/ui/LoginInterface.cpp | 12 ++++++++++++ src/ui/LoginInterface.h | 1 + src/ui/PlayerInterface.cpp | 34 ++++++++++++++++++++++++++++++++++ src/ui/PlayerInterface.h | 1 + src/ui/UploadInterface.cpp | 8 ++++++++ src/ui/UploadInterface.h | 1 + 10 files changed, 70 insertions(+), 3 deletions(-) mode change 100644 => 100755 run.sh diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 index 214de92..7926065 --- a/run.sh +++ b/run.sh @@ -1,2 +1,2 @@ #!/bin/bash -./arbitrateor --docroot /use/share/Wt --http-address 0.0.0.0 --http-port 8080 -c wt_config.xml +./arbitrateor --docroot /usr/share/Wt --http-address 0.0.0.0 --http-port 8080 -c wt_config.xml diff --git a/src/GroovePlayer.cpp b/src/GroovePlayer.cpp index 3422b83..f965456 100644 --- a/src/GroovePlayer.cpp +++ b/src/GroovePlayer.cpp @@ -746,11 +746,12 @@ void GroovePlayerMgr::grooveAudioScannerLoop() } for(std::filesystem::directory_entry p: std::filesystem::directory_iterator(musicScanDir)) { - if(addFileToTrackDBIfTagged(&sqlSession, p.path()) == ScanResults::ACCEPTED) + ScanResults result = addFileToTrackDBIfTagged(&sqlSession, p.path()); + if(result == ScanResults::ACCEPTED) { Wt::log("info") << p.path().string() << " was added to DB"; } - else + else if(result != ScanResults::DUPLICATE_TRACK && result != ScanResults::WRONG_FILETYPE) { Wt::log("info") << p.path().string() + " was not accepted."; } diff --git a/src/ui/AdminInterface.cpp b/src/ui/AdminInterface.cpp index f3a7eb7..c3240b8 100644 --- a/src/ui/AdminInterface.cpp +++ b/src/ui/AdminInterface.cpp @@ -40,6 +40,14 @@ AdminInterface::AdminInterface(WebInterface* app) addBtn->clicked().connect(this, &AdminInterface::addClicked); } +AdminInterface::~AdminInterface() +{ + delete addBtn; + delete passwordField; + delete usernameField; + delete userLayout; +} + void AdminInterface::addClicked() { Wt::Dbo::Session sqlSession; diff --git a/src/ui/AdminInterface.h b/src/ui/AdminInterface.h index f444d0e..be07b47 100644 --- a/src/ui/AdminInterface.h +++ b/src/ui/AdminInterface.h @@ -30,6 +30,7 @@ class AdminInterface : public Wt::WContainerWidget { public: AdminInterface(WebInterface* app); + ~AdminInterface(); WebInterface* app; Wt::WHBoxLayout* userLayout; diff --git a/src/ui/LoginInterface.cpp b/src/ui/LoginInterface.cpp index 32f5ed8..201666e 100644 --- a/src/ui/LoginInterface.cpp +++ b/src/ui/LoginInterface.cpp @@ -56,6 +56,18 @@ LoginInterface::LoginInterface(WebInterface* app) loginContainer->setWidth(Wt::WLength(50, Wt::WLength::Percentage)); } +LoginInterface::~LoginInterface() +{ + delete loginButton; + delete passwordField; + delete usernameField; + delete passwordContainer; + delete usernameContainer; + delete loginMessage; + delete loginLayout; + delete loginContainer; +} + void LoginInterface::checkSessionValidity() { Wt::Dbo::Session sqlSession; diff --git a/src/ui/LoginInterface.h b/src/ui/LoginInterface.h index b75ce36..9bc74a6 100644 --- a/src/ui/LoginInterface.h +++ b/src/ui/LoginInterface.h @@ -33,6 +33,7 @@ class LoginInterface : public Wt::WContainerWidget { public: LoginInterface(WebInterface* app); + ~LoginInterface(); void checkSessionValidity(); void createUser(Wt::Dbo::Session* session, std::string username, std::string rawPassword, bool isAdmin); private: diff --git a/src/ui/PlayerInterface.cpp b/src/ui/PlayerInterface.cpp index d5b9aad..d6262a1 100644 --- a/src/ui/PlayerInterface.cpp +++ b/src/ui/PlayerInterface.cpp @@ -144,6 +144,40 @@ PlayerInterface::PlayerInterface(WebInterface* app) voteTracksLayout->addLayout(track3); } +PlayerInterface::~PlayerInterface() +{ +// Keep these out until I have a good reason to use. +// delete mainDisplay; +// delete requestPane; +// delete uploadPane; +// delete adminPane; +// delete track3vote; +// delete track2vote; +// delete track1vote; +// delete track3votecount; +// delete track2votecount; +// delete track1votecount; +// delete track3details; +// delete track2details; +// delete track1details; +// delete voteTracksLayout; +// delete voteTracksContainer; +// delete votePanel; +// delete voteControlContainer; +// delete voteMetaLayout; +// delete voteMetaContainer; +// delete skipRequest; +// delete skipDeny; +// delete playpause; +// delete currentTrackDetails; +// delete trackProgress; +// delete currentTrackProgress; +// delete skipControls; +// delete playControlLayout; +// delete playControlWidget; +// delete interfaceLayout; +} + void PlayerInterface::playpauseClicked() { if(!isPaused) diff --git a/src/ui/PlayerInterface.h b/src/ui/PlayerInterface.h index 9adcb35..669761a 100644 --- a/src/ui/PlayerInterface.h +++ b/src/ui/PlayerInterface.h @@ -39,6 +39,7 @@ class PlayerInterface : public Wt::WContainerWidget { public: PlayerInterface(WebInterface* app); + ~PlayerInterface(); WebInterface* app; Wt::WVBoxLayout* interfaceLayout; diff --git a/src/ui/UploadInterface.cpp b/src/ui/UploadInterface.cpp index 113830f..9b5eb02 100644 --- a/src/ui/UploadInterface.cpp +++ b/src/ui/UploadInterface.cpp @@ -40,6 +40,14 @@ UploadInterface::UploadInterface(WebInterface* app) mainLayout->addWidget(logs); } +UploadInterface::~UploadInterface() +{ + delete clearLogs; + delete logs; + delete fileDrop; + delete mainLayout; +} + void UploadInterface::reInitUploadBox() { if(fileDrop != nullptr) delete fileDrop; diff --git a/src/ui/UploadInterface.h b/src/ui/UploadInterface.h index 0ecd759..523a9f6 100644 --- a/src/ui/UploadInterface.h +++ b/src/ui/UploadInterface.h @@ -32,6 +32,7 @@ class UploadInterface : public Wt::WContainerWidget { public: UploadInterface(WebInterface* app); + ~UploadInterface(); WebInterface* app; Wt::WVBoxLayout* mainLayout; -- GitLab