Removed the database lib from services as it is still not a service

src/libs/subsonic/impl/ParameterParsing.hpp

@@ -25,7 +25,7 @@
 #include <vector>
 #include <string>
 
-#include "services/database/Types.hpp"
+#include "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 "services/database/UserId.hpp"
+#include "database/UserId.hpp"
 #include "ClientInfo.hpp"
 #include "ProtocolVersion.hpp"
 

src/libs/subsonic/impl/SubsonicId.hpp

@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include "services/database/ArtistId.hpp"
-#include "services/database/ReleaseId.hpp"
-#include "services/database/TrackId.hpp"
-#include "services/database/TrackListId.hpp"
+#include "database/ArtistId.hpp"
+#include "database/ReleaseId.hpp"
+#include "database/TrackId.hpp"
+#include "database/TrackListId.hpp"
 #include "utils/String.hpp"
 
 namespace API::Subsonic

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -24,9 +24,9 @@
 
 #include "services/auth/IPasswordService.hpp"
 #include "services/auth/IEnvService.hpp"
-#include "services/database/Db.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Db.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "utils/EnumSet.hpp"
 #include "utils/IConfig.hpp"
 #include "utils/ILogger.hpp"

src/libs/subsonic/impl/SubsonicResource.hpp

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

src/libs/subsonic/impl/entrypoints/AlbumSongLists.cpp

@@ -19,12 +19,12 @@
 
 #include "AlbumSongLists.hpp"
 
-#include "services/database/Artist.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 "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "responses/Album.hpp"

src/libs/subsonic/impl/entrypoints/Bookmarks.cpp

@@ -19,10 +19,10 @@
 
 #include "Bookmarks.hpp"
 
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackBookmark.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
+#include "database/Track.hpp"
+#include "database/TrackBookmark.hpp"
 #include "responses/Bookmark.hpp"
 #include "responses/Song.hpp"
 #include "ParameterParsing.hpp"

src/libs/subsonic/impl/entrypoints/Browsing.cpp

@@ -19,12 +19,12 @@
 
 #include "Browsing.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/Cluster.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Session.hpp"
+#include "database/Release.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "utils/ILogger.hpp"
 #include "utils/Random.hpp"

src/libs/subsonic/impl/entrypoints/MediaAnnotation.cpp

@@ -21,9 +21,9 @@
 
 #include <vector>
 
-#include "services/database/ArtistId.hpp"
-#include "services/database/ReleaseId.hpp"
-#include "services/database/TrackId.hpp"
+#include "database/ArtistId.hpp"
+#include "database/ReleaseId.hpp"
+#include "database/TrackId.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"

src/libs/subsonic/impl/entrypoints/MediaRetrieval.cpp

@@ -25,9 +25,9 @@
 #include "av/TranscodingResourceHandlerCreator.hpp"
 #include "av/Types.hpp"
 #include "services/cover/ICoverService.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "utils/IResourceHandler.hpp"
 #include "utils/ILogger.hpp"
 #include "utils/FileResourceHandlerCreator.hpp"

src/libs/subsonic/impl/entrypoints/Playlists.cpp

@@ -19,10 +19,10 @@
 
 #include "Playlists.hpp"
 
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackList.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "responses/Playlist.hpp"
 #include "responses/Song.hpp"
 #include "ParameterParsing.hpp"

src/libs/subsonic/impl/entrypoints/Searching.cpp

@@ -19,11 +19,11 @@
 
 #include "Searching.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Session.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/Session.hpp"
+#include "database/Track.hpp"
+#include "database/User.hpp"
 #include "responses/Album.hpp"
 #include "responses/Artist.hpp"
 #include "responses/Song.hpp"

src/libs/subsonic/impl/entrypoints/UserManagement.cpp

@@ -1,7 +1,7 @@
 #include "UserManagement.hpp"
 
-#include "services/database/Session.hpp"
-#include "services/database/User.hpp"
+#include "database/Session.hpp"
+#include "database/User.hpp"
 #include "services/auth/IPasswordService.hpp"
 #include "utils/Service.hpp"
 #include "responses/User.hpp"

src/libs/subsonic/impl/responses/Album.cpp

@@ -19,10 +19,10 @@
 
 #include "responses/Album.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/Cluster.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"

src/libs/subsonic/impl/responses/Album.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/Artist.cpp

@@ -19,10 +19,10 @@
 
 #include "responses/Artist.hpp"
 
-#include "services/database/Artist.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/TrackArtistLink.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Release.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "utils/Service.hpp"
 #include "utils/String.hpp"

src/libs/subsonic/impl/responses/Artist.hpp

@@ -21,8 +21,8 @@
 
 #include <string>
 #include <vector>
-#include "services/database/Object.hpp"
-#include "services/database/Types.hpp"
+#include "database/Object.hpp"
+#include "database/Types.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/Bookmark.cpp

@@ -19,8 +19,8 @@
 
 #include "responses/Bookmark.hpp"
 
-#include "services/database/TrackBookmark.hpp"
-#include "services/database/User.hpp"
+#include "database/TrackBookmark.hpp"
+#include "database/User.hpp"
 
 namespace API::Subsonic
 {

src/libs/subsonic/impl/responses/Bookmark.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/Contributor.cpp

@@ -19,8 +19,8 @@
 
 #include "responses/Contributor.hpp"
 
-#include "services/database/Object.hpp"
-#include "services/database/TrackArtistLink.hpp"
+#include "database/Object.hpp"
+#include "database/TrackArtistLink.hpp"
 #include "SubsonicResponse.hpp"
 #include "responses/Artist.hpp"
 

src/libs/subsonic/impl/responses/Contributor.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/DiscTitle.hpp

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

src/libs/subsonic/impl/responses/Genre.cpp

@@ -19,7 +19,7 @@
 
 #include "responses/Genre.hpp"
 
-#include "services/database/Cluster.hpp"
+#include "database/Cluster.hpp"
 
 namespace API::Subsonic
 {

src/libs/subsonic/impl/responses/Genre.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/ItemGenre.cpp

@@ -19,7 +19,7 @@
 
 #include "responses/ItemGenre.hpp"
 
-#include "services/database/Cluster.hpp"
+#include "database/Cluster.hpp"
 
 namespace API::Subsonic
 {

src/libs/subsonic/impl/responses/Playlist.cpp

@@ -19,8 +19,8 @@
 
 #include "Playlist.hpp"
 
-#include "services/database/TrackList.hpp"
-#include "services/database/User.hpp"
+#include "database/TrackList.hpp"
+#include "database/User.hpp"
 #include "SubsonicId.hpp"
 
 namespace API::Subsonic

src/libs/subsonic/impl/responses/Playlist.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/ReplayGain.cpp

@@ -19,7 +19,7 @@
 
 #include "responses/ReplayGain.hpp"
 
-#include "services/database/Track.hpp"
+#include "database/Track.hpp"
 
 namespace API::Subsonic
 {

src/libs/subsonic/impl/responses/ReplayGain.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/Song.cpp

@@ -22,12 +22,12 @@
 #include <string_view>
 
 #include "av/IAudioFile.hpp"
-#include "services/database/Artist.hpp"
-#include "services/database/Cluster.hpp"
-#include "services/database/Release.hpp"
-#include "services/database/Track.hpp"
-#include "services/database/TrackArtistLink.hpp"
-#include "services/database/User.hpp"
+#include "database/Artist.hpp"
+#include "database/Cluster.hpp"
+#include "database/Release.hpp"
+#include "database/Track.hpp"
+#include "database/TrackArtistLink.hpp"
+#include "database/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 #include "utils/Service.hpp"

src/libs/subsonic/impl/responses/Song.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database

src/libs/subsonic/impl/responses/User.cpp

@@ -19,7 +19,7 @@
 
 #include "responses/User.hpp"
 
-#include "services/database/User.hpp"
+#include "database/User.hpp"
 
 namespace API::Subsonic
 {

src/libs/subsonic/impl/responses/User.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "services/database/Object.hpp"
+#include "database/Object.hpp"
 #include "SubsonicResponse.hpp"
 
 namespace Database