Migrated database stuff

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

@@ -19,9 +19,9 @@
 
 #include "AuthServiceBase.hpp"
 
-#include "database/Db.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.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 "database/User.hpp"
+#include "services/database/Session.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 "database/User.hpp"
+#include "services/database/Session.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 "database/User.hpp"
+#include "services/database/Session.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 "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.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 "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Session.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 "database/User.hpp"
+#include "services/database/Session.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 "database/Cluster.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Session.hpp"
+#include "services/database/Cluster.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 "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackList.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/TrackFeatures.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 "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackFeatures.hpp"
+#include "services/database/Session.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 "database/Session.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Session.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 "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Track.hpp"
+#include "services/database/Session.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 "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/User.hpp"
-#include "database/Track.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/User.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 "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
-#include "database/Types.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackList.hpp"
+#include "services/database/Types.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 "database/Session.hpp"
-#include "database/ScanSettings.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.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 "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackList.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.hpp"
+#include "services/database/TrackFeatures.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 "database/Cluster.hpp"
-#include "database/Release.hpp"
-#include "database/ScanSettings.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackFeatures.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/ScanSettings.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackArtistLink.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 "database/ScanSettings.hpp"
-#include "database/Session.hpp"
+#include "services/database/Types.hpp"
+#include "services/database/ScanSettings.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 "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.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 "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.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 "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.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 "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackList.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 "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/TrackList.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 "database/Track.hpp"
-#include "database/User.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.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 "database/Cluster.hpp"
-#include "database/Db.hpp"
-#include "database/Release.hpp"
-#include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "services/database/Artist.hpp"
+#include "services/database/Cluster.hpp"
+#include "services/database/Db.hpp"
+#include "services/database/Release.hpp"
+#include "services/database/Session.hpp"
+#include "services/database/Track.hpp"
+#include "services/database/TrackBookmark.hpp"
+#include "services/database/TrackList.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"