Moved util functions into utils

src/Makefile.am

@@ -4,7 +4,6 @@ lms_SOURCES = \
 	$(srcdir)/main/main.cpp					\
 	$(srcdir)/av/AvInfo.cpp					\
 	$(srcdir)/av/AvTranscoder.cpp				\
-	$(srcdir)/config/Config.cpp				\
 	$(srcdir)/cover/CoverArtGrabber.cpp			\
 	$(srcdir)/database/Artist.cpp				\
 	$(srcdir)/database/DatabaseHandler.cpp			\
@@ -23,7 +22,6 @@ lms_SOURCES = \
 	$(srcdir)/feature/FeatureExtractor.cpp			\
 	$(srcdir)/feature/FeatureStore.cpp			\
 	$(srcdir)/image/Image.cpp				\
-	$(srcdir)/logger/Logger.cpp				\
 	$(srcdir)/metadata/AvFormat.cpp				\
 	$(srcdir)/metadata/TagLibParser.cpp			\
 	$(srcdir)/ui/LmsApplication.cpp				\
@@ -61,6 +59,8 @@ lms_SOURCES = \
 	$(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp	\
 	$(srcdir)/ui/settings/SettingsUserFormView.cpp		\
 	$(srcdir)/ui/settings/SettingsUsers.cpp			\
+	$(srcdir)/utils/Config.cpp				\
+	$(srcdir)/utils/Logger.cpp				\
 	$(srcdir)/utils/Path.cpp				\
 	$(srcdir)/utils/Utils.cpp
 

src/av/AvInfo.cpp

@@ -19,7 +19,7 @@
 
 #include <array>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvInfo.hpp"
 

src/av/AvTranscoder.cpp

@@ -20,8 +20,7 @@
 #include <mutex>
 
 #include "utils/Path.hpp"
-
+#include "utils/Logger.hpp"
-#include "logger/Logger.hpp"
 
 #include "AvTranscoder.hpp"
 

src/cover/CoverArtGrabber.cpp

@@ -17,9 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
 #include "av/AvInfo.hpp"
 
+#include "utils/Logger.hpp"
+
 #include "CoverArtGrabber.hpp"
 
 namespace {

src/database/Artist.cpp

@@ -20,7 +20,7 @@
 #include "Types.hpp"
 #include "SqlQuery.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 namespace Database
 {

src/database/DatabaseHandler.cpp

@@ -30,7 +30,7 @@
 
 #include "Setting.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "DatabaseHandler.hpp"
 

src/database/SearchFilter.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SearchFilter.hpp"
 

src/database/Track.cpp

@@ -21,7 +21,7 @@
 
 #include <Wt/Dbo/QueryModel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"
 

src/database/updater/DatabaseFeatureExtractor.cpp

@@ -17,11 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
+#include "database/Setting.hpp"
 
 #include "feature/FeatureExtractor.hpp"
 #include "feature/FeatureStore.hpp"
-#include "database/Setting.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "DatabaseFeatureExtractor.hpp"
 

src/database/updater/DatabaseHighLevelCluster.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
-
 #include "database/Setting.hpp"
 #include "feature/FeatureStore.hpp"
 
+#include "utils/Logger.hpp"
+
 #include "DatabaseHighLevelCluster.hpp"
 
 namespace Database {

src/database/updater/DatabaseUpdater.cpp

@@ -23,14 +23,16 @@
 #include <boost/thread.hpp>
 #include <boost/asio/placeholders.hpp>
 
-#include "logger/Logger.hpp"
 #include "cover/CoverArtGrabber.hpp"
-#include "utils/Utils.hpp"
-#include "utils/Path.hpp"
 
 #include "database/Setting.hpp"
 #include "database/Types.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Path.hpp"
+#include "utils/Utils.hpp"
+
+
 #include "DatabaseUpdater.hpp"
 
 namespace {

src/feature/FeatureExtractor.cpp

@@ -25,7 +25,7 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Path.hpp"
 
 #include "FeatureExtractor.hpp"

src/feature/FeatureStore.cpp

@@ -19,8 +19,8 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "logger/Logger.hpp"
+#include "utils/Config.hpp"
-#include "config/Config.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Path.hpp"
 
 #include "FeatureStore.hpp"

src/image/Image.cpp

@@ -16,7 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "Image.hpp"
 

src/main/main.cpp

@@ -21,10 +21,10 @@
 
 #include <Wt/WServer>
 
-#include "config/Config.hpp"
+#include "utils/Config.hpp"
 #include "av/AvInfo.hpp"
 #include "av/AvTranscoder.hpp"
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "image/Image.hpp"
 #include "feature/FeatureExtractor.hpp"
 

src/metadata/AvFormat.cpp

@@ -17,14 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AvFormat.hpp"
-
-#include "logger/Logger.hpp"
-#include "utils/Utils.hpp"
 #include <boost/algorithm/string.hpp>
 
 #include "av/AvInfo.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
+
+#include "AvFormat.hpp"
+
 
 namespace MetaData
 {

src/metadata/TagLibParser.cpp

@@ -23,7 +23,7 @@
 #include <taglib/mpegfile.h>
 #include <taglib/id3v2tag.h>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "TagLibParser.hpp"

src/ui/LmsApplication.cpp

@@ -28,7 +28,7 @@
 #include <Wt/Auth/Identity>
 
 #include "config/config.h"
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "settings/Settings.hpp"

src/ui/audio/AudioPlayer.cpp

@@ -17,7 +17,6 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <Wt/WText>
 #include <Wt/WAudio>
 #include <Wt/WImage>
@@ -25,7 +24,8 @@
 #include <Wt/WPushButton>
 
 #include "common/InputRange.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"

src/ui/audio/desktop/DesktopAudio.cpp

@@ -31,7 +31,8 @@
 #include <Wt/WLineEdit>
 #include <Wt/WLabel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TableFilter.hpp"

src/ui/audio/desktop/PlayQueue.cpp

@@ -27,7 +27,7 @@
 #include <Wt/WFileResource>
 #include <Wt/WTheme>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "PlayQueue.hpp"

src/ui/audio/desktop/TableFilter.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WItemDelegate>
 
 #include "database/Types.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "TableFilter.hpp"

src/ui/audio/desktop/TrackView.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WItemDelegate>
 #include <Wt/WBreak>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"

src/ui/audio/mobile/ArtistSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"

src/ui/audio/mobile/MobileAudio.cpp

@@ -23,10 +23,8 @@
 #include <Wt/WTemplate>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
-#include "utils/Utils.hpp"
-
 #include "audio/AudioPlayer.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "PreviewSearchView.hpp"
@@ -39,6 +37,9 @@
 
 #include "MobilePlayQueue.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
+
 #include "MobileAudio.hpp"
 
 

src/ui/audio/mobile/MobilePlayQueue.cpp

@@ -22,7 +22,7 @@
 #include <Wt/WText>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 

src/ui/audio/mobile/PreviewSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"

src/ui/audio/mobile/ReleaseSearch.cpp

@@ -22,7 +22,8 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseSearch.hpp"

src/ui/audio/mobile/ReleaseView.cpp

@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseView.hpp"

src/ui/audio/mobile/TrackSearch.cpp

@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TrackSearch.hpp"

src/ui/audio/mobile/TrackSearchView.cpp

@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "TrackSearch.hpp"

src/ui/resource/AvConvTranscodeStreamResource.cpp

@@ -21,7 +21,7 @@
 #include <Wt/Http/Request>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvConvTranscodeStreamResource.hpp"
 

src/ui/resource/ImageResource.cpp

@@ -20,8 +20,9 @@
 #include <Wt/WApplication>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "cover/CoverArtGrabber.hpp"

src/ui/resource/TranscodeResource.cpp

@@ -19,7 +19,8 @@
 
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TranscodeResource.hpp"

src/ui/settings/Settings.cpp

@@ -29,7 +29,8 @@
 #include "SettingsMediaDirectories.hpp"
 #include "SettingsUsers.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 #include "database/updater/DatabaseUpdater.hpp"
 

src/ui/settings/SettingsAccountFormView.cpp

@@ -26,7 +26,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsAudioFormView.cpp

@@ -24,7 +24,7 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsDatabaseFormView.cpp

@@ -30,7 +30,8 @@
 #include <Wt/WFormModel>
 #include <Wt/WStringListModel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 
 #include "common/DirectoryValidator.hpp"

src/ui/settings/SettingsFirstConnectionFormView.cpp

@@ -24,7 +24,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsMediaDirectoryFormView.cpp

@@ -25,7 +25,8 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/MediaDirectory.hpp"
 
 #include "common/DirectoryValidator.hpp"

src/ui/settings/SettingsUserFormView.cpp

@@ -27,7 +27,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/settings/SettingsUsers.cpp

@@ -25,7 +25,7 @@
 
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SettingsUserFormView.hpp"
 #include "LmsApplication.hpp"

src/utils/Config.cpp

@@ -30,6 +30,12 @@ Config::Config()
 {
 }
 
+Config::~Config()
+{
+	if (_config)
+		delete _config;
+}
+
 Config&
 Config::instance()
 {

src/utils/Config.hpp

@@ -43,6 +43,7 @@ class Config
 	private:
 
 		Config();
+		~Config();
 
 		libconfig::Config	*_config;
 };

src/utils/Path.cpp

@@ -23,7 +23,7 @@
 #include <boost/crc.hpp>  // for boost::crc_32_type
 #include <boost/tokenizer.hpp>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "Path.hpp"