Migrated database stuff

src/libs/services/auth/impl/AuthServiceBase.cpp

@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth

src/libs/services/auth/impl/AuthServiceBase.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string_view>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/auth/impl/AuthTokenService.cpp

@@ -24,8 +24,8 @@
 #include <Wt/WRandom.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/services/auth/impl/PasswordServiceBase.cpp

@@ -28,8 +28,8 @@
 #endif // LMS_SUPPORT_PAM
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/services/auth/impl/internal/InternalPasswordService.cpp

@@ -22,8 +22,8 @@
 
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/services/auth/impl/internal/InternalPasswordService.hpp

@@ -22,7 +22,7 @@
 #include <Wt/Auth/HashFunction.h>
 #include <Wt/Auth/PasswordStrengthValidator.h>
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "PasswordServiceBase.hpp"
 #include "LoginThrottler.hpp"
 

src/libs/services/auth/impl/pam/PAMPasswordService.cpp

@@ -27,7 +27,7 @@
 #include <security/pam_appl.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/Logger.hpp"
 
 namespace Auth

src/libs/services/auth/include/services/auth/IAuthTokenService.hpp

@@ -27,7 +27,7 @@
 #include <boost/asio/ip/address.hpp>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/IEnvService.hpp

@@ -22,7 +22,7 @@
 #include <optional>
 #include <string>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/IPasswordService.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/ptr.h>
 
 #include "services/auth/Types.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/auth/include/services/auth/Types.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include <string>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/Exception.hpp"
 
 namespace Auth

src/libs/services/cover/impl/CoverService.cpp

@@ -21,10 +21,10 @@
 
 #include "av/IAudioFile.hpp"
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 
 #include "image/Exception.hpp"
 #include "image/IRawImage.hpp"

src/libs/services/cover/impl/CoverService.hpp

@@ -31,7 +31,7 @@
 
 #include "services/cover/ICoverService.hpp"
 #include "image/IEncodedImage.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/cover/include/services/cover/ICoverService.hpp

@@ -22,7 +22,7 @@
 #include <filesystem>
 #include <memory>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "image/IEncodedImage.hpp"
 
 namespace Database

src/libs/services/database/impl/Artist.cpp

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"

src/libs/services/database/impl/Cluster.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"
 

src/libs/services/database/impl/Db.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
 
 #include <Wt/Dbo/FixedSqlConnectionPool.h>
 #include <Wt/Dbo/backend/Sqlite3.h>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {

src/libs/services/database/impl/Release.cpp

@@ -17,15 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "SqlQuery.hpp"
 #include "Traits.hpp"

src/libs/services/database/impl/ScanSettings.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
@@ -25,8 +25,8 @@
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 
 namespace {
 

src/libs/services/database/impl/Session.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 
 #include <map>
 #include <mutex>
@@ -27,17 +27,17 @@
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackBookmark.hpp"
+#include "services/database/TrackBookmark.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 namespace Database
 {

src/libs/services/database/impl/Track.cpp

@@ -17,17 +17,17 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 
 #include <Wt/Dbo/WtSqlTraits.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"

src/libs/services/database/impl/TrackArtistLink.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 
 #include "Traits.hpp"
 

src/libs/services/database/impl/TrackBookmark.cpp

@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackBookmark.hpp"
+#include "services/database/TrackBookmark.hpp"
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "Traits.hpp"
 
 namespace Database {

src/libs/services/database/impl/TrackFeatures.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Logger.hpp"
 
 namespace Database {

src/libs/services/database/impl/TrackList.cpp

@@ -16,18 +16,18 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 
 #include <cassert>
 
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "SqlQuery.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"

src/libs/services/database/impl/Traits.hpp

@@ -22,7 +22,7 @@
 #include <type_traits>
 #include <Wt/Dbo/StdSqlTraits.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Wt::Dbo
 {

src/libs/services/database/impl/User.cpp

@@ -17,13 +17,13 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 #include "utils/Logger.hpp"
 #include "StringViewTraits.hpp"
 #include "Traits.hpp"

src/libs/services/database/include/services/database/Artist.hpp

@@ -27,7 +27,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 

src/libs/services/database/include/services/database/Cluster.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/Release.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WDateTime.h>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database

src/libs/services/database/include/services/database/ScanSettings.hpp

@@ -25,7 +25,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/Track.hpp

@@ -34,7 +34,7 @@
 #include "utils/EnumSet.hpp"
 #include "utils/UUID.hpp"
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/TrackArtistLink.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 
 namespace Database

src/libs/services/database/include/services/database/TrackBookmark.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/TrackFeatures.hpp

@@ -26,7 +26,7 @@
 
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/TrackList.hpp

@@ -27,7 +27,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database {
 

src/libs/services/database/include/services/database/User.hpp

@@ -26,7 +26,7 @@
 #include <Wt/Dbo/Dbo.h>
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/UUID.hpp"
 
 namespace Database {

src/libs/services/database/test/Common.hpp

@@ -24,17 +24,17 @@
 
 #include <gtest/gtest.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
+#include "services/database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 template <typename T>
 class ScopedEntity

src/libs/services/recommendation/impl/IEngine.hpp

@@ -22,7 +22,7 @@
 #include <functional>
 #include <memory>
 #include <string_view>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/EnumSet.hpp"
 #include "services/recommendation/Types.hpp"
 

src/libs/services/recommendation/impl/RecommendationService.cpp

@@ -25,9 +25,9 @@
 #include "ClustersEngineCreator.hpp"
 #include "FeaturesEngineCreator.hpp"
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 

src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp

@@ -19,13 +19,13 @@
 
 #include "ClustersEngine.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 
 namespace Recommendation {
 

src/libs/services/recommendation/impl/features/FeaturesEngine.cpp

@@ -21,14 +21,14 @@
 
 #include <numeric>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 #include "som/DataNormalizer.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"

src/libs/services/recommendation/impl/features/FeaturesEngineCache.hpp

@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "som/Network.hpp"
 
 namespace Recommendation {

src/libs/services/recommendation/include/services/recommendation/Types.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <functional>
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Recommendation
 {

src/libs/services/scanner/impl/ScannerService.cpp

@@ -24,13 +24,13 @@
 
 #include <Wt/WLocalDateTime.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/TrackFeatures.hpp"
 #include "metadata/TagLibParser.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Exception.hpp"

src/libs/services/scanner/impl/ScannerService.hpp

@@ -30,9 +30,9 @@
 
 #include <boost/asio/system_timer.hpp>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "metadata/IParser.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Path.hpp"

src/libs/services/scanner/include/services/scanner/ScannerStats.hpp

@@ -24,7 +24,7 @@
 #include <filesystem>
 #include <vector>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Scanner {
 

src/libs/services/scrobbling/impl/ScrobblingService.cpp

@@ -19,13 +19,13 @@
 
 #include "ScrobblingService.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 #include "internal/InternalScrobbler.hpp"
 #include "listenbrainz/ListenBrainzScrobbler.hpp"

src/libs/services/scrobbling/impl/internal/InternalScrobbler.cpp

@@ -19,11 +19,11 @@
 
 #include "InternalScrobbler.hpp"
 
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 
 namespace Scrobbling

src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzScrobbler.cpp

@@ -24,13 +24,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"
 #include "utils/Logger.hpp"

src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp

@@ -25,13 +25,13 @@
 #include <Wt/Json/Value.h>
 #include <Wt/Json/Serializer.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "services/scrobbling/Exception.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/http/IClient.hpp"

src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.hpp

@@ -26,7 +26,7 @@
 #include <boost/asio/steady_timer.hpp>
 #include <Wt/Dbo/Dbo.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "services/scrobbling/Listen.hpp"
 
 namespace Database

src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp

@@ -21,9 +21,9 @@
 
 #include <string_view>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 static constexpr std::string_view historyTracklistName {"__scrobbler_listenbrainz_history__"};
 

src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp

@@ -22,7 +22,7 @@
 #include <Wt/Dbo/ptr.h>
 #include "utils/UUID.hpp"
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp

@@ -29,7 +29,7 @@
 #include <Wt/WDateTime.h>
 
 #include "services/scrobbling/Listen.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/libs/services/scrobbling/include/services/scrobbling/Listen.hpp

@@ -21,7 +21,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Scrobbling
 {

src/libs/subsonic/impl/ParameterParsing.hpp

@@ -20,7 +20,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/String.hpp"
 #include "SubsonicResponse.hpp"
 

src/libs/subsonic/impl/RequestContext.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/Http/Request.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "ProtocolVersion.hpp"
 

src/libs/subsonic/impl/Stream.cpp

@@ -22,9 +22,9 @@
 #include "av/TranscodeParameters.hpp"
 #include "av/TranscodeResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/IResourceHandler.hpp"
 #include "utils/Logger.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"

src/libs/subsonic/impl/SubsonicId.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/String.hpp"
 
 namespace API::Subsonic

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -28,15 +28,15 @@
 
 #include "services/auth/IPasswordService.hpp"
 #include "services/auth/IEnvService.hpp"
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackBookmark.hpp"
+#include "services/database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "services/cover/ICoverService.hpp"

src/libs/subsonic/impl/SubsonicResource.hpp

@@ -24,7 +24,7 @@
 #include <Wt/WResource.h>
 #include <Wt/Http/Response.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ClientInfo.hpp"
 #include "RequestContext.hpp"
 

src/lms/main.cpp

@@ -29,12 +29,12 @@
 #include "services/auth/IPasswordService.hpp"
 #include "services/auth/IEnvService.hpp"
 #include "services/cover/ICoverService.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "services/scanner/IScannerService.hpp"
-#include "subsonic/SubsonicResource.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
+#include "services/scanner/IScannerService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
+#include "subsonic/SubsonicResource.hpp"
 #include "ui/LmsApplication.hpp"
 #include "ui/LmsApplicationManager.hpp"
 #include "utils/http/IClient.hpp"

src/lms/ui/Auth.cpp

@@ -30,8 +30,8 @@
 
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 

src/lms/ui/Auth.hpp

@@ -21,19 +21,20 @@
 
 #include <Wt/WTemplateFormView.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
-namespace UserInterface {
+namespace UserInterface
-
-std::optional<Database::UserId>
-processAuthToken(const Wt::WEnvironment& env);
-
-class Auth : public Wt::WTemplateFormView
 {
-	public:
-		Auth();
 
-		Wt::Signal<Database::UserId> userLoggedIn;
+	std::optional<Database::UserId>
-};
+	processAuthToken(const Wt::WEnvironment& env);
+
+	class Auth : public Wt::WTemplateFormView
+	{
+		public:
+			Auth();
+
+			Wt::Signal<Database::UserId> userLoggedIn;
+	};
 
 } // namespace UserInterface

src/lms/ui/LmsApplication.cpp

@@ -31,12 +31,12 @@
 #include "services/auth/IEnvService.hpp"
 #include "services/auth/IPasswordService.hpp"
 #include "services/cover/ICoverService.hpp"
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Db.hpp"
+#include "services/database/Db.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/LmsApplicationException.hpp

@@ -19,41 +19,38 @@
 
 #pragma once
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "utils/Exception.hpp"
 
-namespace UserInterface {
+namespace UserInterface
-
-
-class LmsApplicationException : public LmsException
 {
-	public:
+	class LmsApplicationException : public LmsException
-		LmsApplicationException(const Wt::WString& error) : LmsException {error.toUTF8()} {}
+	{
-};
+		public:
+			LmsApplicationException(const Wt::WString& error) : LmsException {error.toUTF8()} {}
+	};
 
-class ArtistNotFoundException : public LmsApplicationException
+	class ArtistNotFoundException : public LmsApplicationException
-{
+	{
-	public:
+		public:
-		ArtistNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.artist-not-found")} {}
+			ArtistNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.artist-not-found")} {}
-};
+	};
 
-class ReleaseNotFoundException : public LmsApplicationException
+	class ReleaseNotFoundException : public LmsApplicationException
-{
+	{
-	public:
+		public:
-		ReleaseNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.release-not-found")} {}
+			ReleaseNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.release-not-found")} {}
-};
+	};
 
-class UserNotFoundException : public LmsApplicationException
+	class UserNotFoundException : public LmsApplicationException
-{
+	{
-	public:
+		public:
-		UserNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-found")} {}
+			UserNotFoundException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-found")} {}
-};
+	};
-
-class UserNotAllowedException : public LmsApplicationException
-{
-	public:
-		UserNotAllowedException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-allowed")} {}
-};
-
-}
 
+	class UserNotAllowedException : public LmsApplicationException
+	{
+		public:
+			UserNotAllowedException() : LmsApplicationException {Wt::WString::tr("Lms.Error.user-not-allowed")} {}
+	};
+} // ns UserInterface

src/lms/ui/LmsApplicationManager.hpp

@@ -25,7 +25,7 @@
 
 #include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {

src/lms/ui/LmsTheme.hpp

@@ -24,23 +24,21 @@
 #include <Wt/WBootstrapTheme.h>
 #include <Wt/WLinkedCssStyleSheet.h>
 
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
-namespace UserInterface {
+namespace UserInterface
-
-class LmsTheme : public Wt::WBootstrapTheme
 {
-	public:
+	class LmsTheme : public Wt::WBootstrapTheme
-		LmsTheme(Database::User::UITheme theme);
+	{
+		public:
+			LmsTheme(Database::User::UITheme theme);
 
-		void setTheme(Database::User::UITheme theme);
+			void setTheme(Database::User::UITheme theme);
 
-	private:
+		private:
-
+			std::vector<Wt::WLinkedCssStyleSheet> styleSheets() const override;
-		std::vector<Wt::WLinkedCssStyleSheet> styleSheets() const override;
+			static std::vector<Wt::WLink> getStyleSheets(Database::User::UITheme theme);
-		static std::vector<Wt::WLink> getStyleSheets(Database::User::UITheme theme);
-
-		Database::User::UITheme _theme;
-};
 
+			Database::User::UITheme _theme;
+	};
 }

src/lms/ui/MediaPlayer.cpp

@@ -25,13 +25,13 @@
 
 #include "utils/Logger.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 #include "resource/CoverResource.hpp"
 #include "resource/AudioTranscodeResource.hpp"

src/lms/ui/MediaPlayer.hpp

@@ -27,7 +27,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface {
 

src/lms/ui/PlayQueue.cpp

@@ -22,12 +22,12 @@
 #include <Wt/WPopupMenu.h>
 #include <Wt/WText.h>
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Random.hpp"

src/lms/ui/PlayQueue.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Similarity

src/lms/ui/PlayQueueAction.hpp

@@ -22,11 +22,10 @@
 #include <vector>
 #include <Wt/WSignal.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {
-
 	enum class PlayQueueAction
 	{
 		Play,

src/lms/ui/SettingsView.cpp

@@ -35,7 +35,7 @@
 #include "common/ValueStringModel.hpp"
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/DatabaseSettingsView.cpp

@@ -26,9 +26,9 @@
 #include <Wt/WString.h>
 #include <Wt/WTemplateFormView.h>
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/InitWizardView.cpp

@@ -25,8 +25,8 @@
 #include <Wt/WPushButton.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"

src/lms/ui/admin/ScannerController.cpp

@@ -28,8 +28,8 @@
 #include <Wt/WResource.h>
 #include <Wt/WSplitButton.h>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "services/scanner/IScannerService.hpp"
 #include "utils/Service.hpp"
 #include "LmsApplication.hpp"

src/lms/ui/admin/UserView.cpp

@@ -28,8 +28,8 @@
 #include <Wt/WFormModel.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/Exception.hpp"
 #include "utils/Logger.hpp"

src/lms/ui/admin/UsersView.cpp

@@ -24,8 +24,8 @@
 #include <Wt/WTemplate.h>
 
 #include "services/auth/IPasswordService.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 #include "utils/Logger.hpp"
 #include "utils/Service.hpp"
 
@@ -34,7 +34,7 @@
 namespace UserInterface {
 
 UsersView::UsersView()
- : Wt::WTemplate(Wt::WString::tr("Lms.Admin.Users.template"))
+ : Wt::WTemplate {Wt::WString::tr("Lms.Admin.Users.template")}
 {
 	addFunction("tr", &Wt::WTemplate::Functions::tr);
 
@@ -45,7 +45,7 @@ UsersView::UsersView()
 		setCondition("if-can-create-user", true);
 
 		Wt::WPushButton* addBtn = bindNew<Wt::WPushButton>("add-btn", Wt::WString::tr("Lms.Admin.Users.add"));
-		addBtn->clicked().connect([]()
+		addBtn->clicked().connect([]
 		{
 			LmsApp->setInternalPath("/admin/user", true);
 		});
@@ -69,8 +69,7 @@ UsersView::refreshView()
 
 	auto transaction {LmsApp->getDbSession().createSharedTransaction()};
 
-	auto users = Database::User::getAll(LmsApp->getDbSession());
+	for (const auto& user : Database::User::getAll(LmsApp->getDbSession()))
-	for (const auto& user : users)
 	{
 		const Database::UserId userId {user->getId()};
 

src/lms/ui/common/LoginNameValidator.cpp

@@ -20,7 +20,7 @@
 #include "LoginNameValidator.hpp"
 
 #include <Wt/WLengthValidator.h>
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 
 namespace UserInterface
 {

src/lms/ui/common/PasswordValidator.hpp

@@ -22,7 +22,7 @@
 #include <functional>
 #include <Wt/WValidator.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "services/auth/Types.hpp"
 
 namespace UserInterface

src/lms/ui/explore/ArtistCollector.cpp

@@ -19,9 +19,9 @@
 
 #include "ArtistCollector.hpp"
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"

src/lms/ui/explore/ArtistCollector.hpp

@@ -23,8 +23,7 @@
 #include <vector>
 
 #include "DatabaseCollectorBase.hpp"
-
+#include "services/database/Types.hpp"
-#include "database/Types.hpp"
 
 namespace Database
 {

src/lms/ui/explore/ArtistListHelpers.cpp

@@ -20,7 +20,7 @@
 
 #include <Wt/WAnchor.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
 #include "LmsApplication.hpp"
 
 namespace UserInterface::ArtistListHelpers

src/lms/ui/explore/ArtistListHelpers.hpp

@@ -23,7 +23,7 @@
 
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace Database
 {

src/lms/ui/explore/ArtistView.cpp

@@ -25,13 +25,13 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/Logger.hpp"
 #include "utils/String.hpp"

src/lms/ui/explore/ArtistView.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
 namespace Database

src/lms/ui/explore/ArtistsView.cpp

@@ -21,8 +21,8 @@
 
 #include <Wt/WMenu.h>
 
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "services/database/TrackArtistLink.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/Logger.hpp"
 

src/lms/ui/explore/ArtistsView.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WComboBox.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "ArtistCollector.hpp"
 
 namespace UserInterface

src/lms/ui/explore/DatabaseCollectorBase.hpp

@@ -25,7 +25,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 namespace UserInterface
 {

src/lms/ui/explore/Explore.cpp

@@ -23,10 +23,10 @@
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Track.hpp"
 #include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"

src/lms/ui/explore/Explore.hpp

@@ -21,32 +21,30 @@
 
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 #include "PlayQueueAction.hpp"
 
-namespace UserInterface {
+namespace UserInterface
-
-class Filters;
-class SearchView;
-
-class Explore : public Wt::WTemplate
 {
-	public:
+	class Filters;
-		Explore(Filters* filters);
+	class SearchView;
 
-		void search(const Wt::WString& searchText);
+	class Explore : public Wt::WTemplate
+	{
+		public:
+			Explore(Filters* filters);
 
-		PlayQueueActionTrackSignal tracksAction;
+			void search(const Wt::WString& searchText);
 
-	private:
+			PlayQueueActionTrackSignal tracksAction;
 
-		void handleArtistsAction(PlayQueueAction action, const std::vector<Database::ArtistId>& artistsId);
+		private:
-		void handleReleasesAction(PlayQueueAction action, const std::vector<Database::ReleaseId>& releasesId);
+			void handleArtistsAction(PlayQueueAction action, const std::vector<Database::ArtistId>& artistsId);
-		void handleTracksAction(PlayQueueAction action, const std::vector<Database::TrackId>& tracksId);
+			void handleReleasesAction(PlayQueueAction action, const std::vector<Database::ReleaseId>& releasesId);
-
+			void handleTracksAction(PlayQueueAction action, const std::vector<Database::TrackId>& tracksId);
-		Filters* _filters {};
-		SearchView* _search {};
-};
 
+			Filters* _filters {};
+			SearchView* _search {};
+	};
 } // namespace UserInterface
 

src/lms/ui/explore/Filters.cpp

@@ -24,8 +24,8 @@
 #include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Cluster.hpp"
+#include "services/database/Cluster.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
 
 #include "LmsApplication.hpp"
 

src/lms/ui/explore/Filters.hpp

@@ -24,31 +24,27 @@
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 
-#include "database/Types.hpp"
+#include "services/database/Types.hpp"
 
 #include "Filters.hpp"
 
-namespace UserInterface {
+namespace UserInterface
-
-class Filters : public Wt::WTemplate
 {
-	public:
+	class Filters : public Wt::WTemplate
-		Filters();
+	{
+		public:
+			Filters();
 
-		void add(Database::ClusterId clusterId);
+			void add(Database::ClusterId clusterId);
+			const std::vector<Database::ClusterId>& getClusterIds() const { return _clusterIds; }
+			Wt::Signal<>& updated() { return _sigUpdated; }
 
-		const std::vector<Database::ClusterId>& getClusterIds() const { return _clusterIds; }
+		private:
-
+			void showDialog();
-		Wt::Signal<>& updated() { return _sigUpdated; }
-
-	private:
-
-		void showDialog();
-
-		Wt::WContainerWidget *_filters;
-		Wt::Signal<> _sigUpdated;
-		std::vector<Database::ClusterId> _clusterIds;
-};
 
+			Wt::WContainerWidget *_filters;
+			Wt::Signal<> _sigUpdated;
+			std::vector<Database::ClusterId> _clusterIds;
+	};
 } // namespace UserInterface
 

src/lms/ui/explore/ReleaseCollector.cpp

@@ -21,10 +21,10 @@
 
 #include <algorithm>
 
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
-#include "database/Session.hpp"
+#include "services/database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/User.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/TrackList.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"
 #include "Filters.hpp"

src/lms/ui/explore/ReleaseListHelpers.cpp

@@ -23,8 +23,8 @@
 #include <Wt/WImage.h>
 #include <Wt/WText.h>
 
-#include "database/Artist.hpp"
+#include "services/database/Artist.hpp"
-#include "database/Release.hpp"
+#include "services/database/Release.hpp"
 #include "resource/CoverResource.hpp"
 
 #include "LmsApplication.hpp"
@@ -33,7 +33,6 @@ using namespace Database;
 
 namespace UserInterface::ReleaseListHelpers
 {
-
 	static
 	std::unique_ptr<Wt::WTemplate>
 	createEntryInternal(const Release::pointer& release, const std::string& templateKey, const Artist::pointer& artist, const bool showYear)
@@ -104,6 +103,5 @@ namespace UserInterface::ReleaseListHelpers
 	{
 		return createEntry(release, artist, true);
 	}
-
 } // namespace UserInterface