Moved service file into utils

src/api/subsonic/SubsonicResource.cpp

@@ -36,9 +36,9 @@
 #include "database/Track.hpp"
 #include "database/TrackList.hpp"
 #include "database/User.hpp"
-#include "main/Service.hpp"
 #include "similarity/SimilaritySearcher.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 #include "SubsonicId.hpp"
 #include "SubsonicResponse.hpp"

src/av/AvTranscoder.cpp

@@ -22,11 +22,11 @@
 #include <atomic>
 #include <mutex>
 
-#include "main/Service.hpp"
 #include "AvInfo.hpp"
 #include "utils/Config.hpp"
 #include "utils/Path.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 
 namespace Av {
 

src/main/main.cpp

@@ -36,7 +36,7 @@
 #include "ui/LmsApplication.hpp"
 #include "utils/Config.hpp"
 #include "utils/Logger.hpp"
-#include "Service.hpp"
+#include "utils/Service.hpp"
 
 std::vector<std::string> generateWtConfig(std::string execPath)
 {

src/similarity/features/AcousticBrainzUtils.cpp

@@ -25,9 +25,9 @@
 #include <Wt/WIOService.h>
 #include <Wt/Http/Client.h>
 
-#include "main/Service.hpp"
 #include "utils/Config.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 
 
 namespace AcousticBrainz

src/similarity/features/SimilarityFeaturesCache.cpp

@@ -22,9 +22,9 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
 
-#include "main/Service.hpp"
 #include "utils/Config.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 namespace Similarity {

src/ui/Auth.cpp

@@ -29,8 +29,8 @@
 
 #include "auth/AuthTokenService.hpp"
 #include "auth/PasswordService.hpp"
-#include "main/Service.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/LmsApplication.cpp

@@ -37,8 +37,8 @@
 #include "database/Release.hpp"
 #include "database/User.hpp"
 #include "explore/Explore.hpp"
-#include "main/Service.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "admin/InitWizardView.hpp"

src/ui/PlayQueueView.cpp

@@ -26,9 +26,9 @@
 #include "database/Track.hpp"
 #include "database/TrackList.hpp"
 #include "database/User.hpp"
-#include "main/Service.hpp"
 #include "similarity/SimilaritySearcher.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 #include "LmsApplication.hpp"
 

src/ui/SettingsView.cpp

@@ -19,21 +19,21 @@
 
 #include "SettingsView.hpp"
 
-#include <Wt/WString.h>
-#include <Wt/WPushButton.h>
 #include <Wt/WCheckBox.h>
 #include <Wt/WComboBox.h>
-#include <Wt/WLineEdit.h>
-#include <Wt/WTemplateFormView.h>
-
 #include <Wt/WFormModel.h>
+#include <Wt/WLineEdit.h>
+#include <Wt/WPushButton.h>
+#include <Wt/WString.h>
+#include <Wt/WTemplateFormView.h>
 
 #include "common/Validators.hpp"
 #include "common/ValueStringModel.hpp"
 
 #include "auth/PasswordService.hpp"
-#include "main/Service.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
+
 #include "LmsApplication.hpp"
 
 namespace UserInterface {

src/ui/admin/DatabaseSettingsView.cpp

@@ -28,8 +28,8 @@
 
 #include "database/Cluster.hpp"
 #include "database/SimilaritySettings.hpp"
-#include "main/Service.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "common/Validators.hpp"

src/ui/admin/DatabaseStatus.cpp

@@ -26,7 +26,7 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WResource.h>
 
-#include "main/Service.hpp"
+#include "utils/Service.hpp"
 #include "scanner/MediaScanner.hpp"
 #include "LmsApplication.hpp"
 

src/ui/admin/InitWizardView.cpp

@@ -24,9 +24,9 @@
 #include <Wt/WPushButton.h>
 
 #include "auth/PasswordService.hpp"
-#include "main/Service.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"

src/ui/admin/UserView.cpp

@@ -30,10 +30,10 @@
 
 #include "auth/PasswordService.hpp"
 #include "database/User.hpp"
-#include "main/Service.hpp"
 #include "utils/Config.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "common/Validators.hpp"

src/ui/explore/ArtistInfoView.cpp

@@ -20,8 +20,8 @@
 #include "ArtistInfoView.hpp"
 
 #include "database/Artist.hpp"
-#include "main/Service.hpp"
 #include "similarity/SimilaritySearcher.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "ArtistLink.hpp"

src/ui/explore/ReleaseInfoView.cpp

@@ -22,8 +22,8 @@
 #include <Wt/WAnchor.h>
 
 #include "database/Release.hpp"
-#include "main/Service.hpp"
 #include "similarity/SimilaritySearcher.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "ReleaseLink.hpp"

src/ui/resource/ImageResource.cpp

@@ -24,9 +24,9 @@
 
 #include "cover/CoverArtGrabber.hpp"
 #include "database/Track.hpp"
-#include "main/Service.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
+#include "utils/Service.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"