Placed db object related files in a subdirectory

src/libs/subsonic/impl/CoverArtId.cpp

@@ -22,7 +22,7 @@
 #include <cassert>
 
 #include "core/String.hpp"
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 
 namespace lms::api::subsonic
 {

src/libs/subsonic/impl/CoverArtId.hpp

@@ -22,7 +22,7 @@
 #include <ctime>
 
 #include "core/String.hpp"
-#include "database/ArtworkId.hpp"
+#include "database/objects/ArtworkId.hpp"
 
 namespace lms::api::subsonic
 {

src/libs/subsonic/impl/SubsonicId.hpp

@@ -20,12 +20,12 @@
 #pragma once
 
 #include "core/String.hpp"
-#include "database/ArtistId.hpp"
-#include "database/DirectoryId.hpp"
-#include "database/MediaLibraryId.hpp"
-#include "database/ReleaseId.hpp"
-#include "database/TrackId.hpp"
-#include "database/TrackListId.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/DirectoryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/TrackListId.hpp"
 
 namespace lms::api::subsonic
 {

src/libs/subsonic/impl/SubsonicResource.cpp

@@ -31,7 +31,7 @@
 #include "core/String.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IAuthTokenService.hpp"
 #include "services/auth/IPasswordService.hpp"
 

src/libs/subsonic/impl/SubsonicResource.hpp

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

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

@@ -22,13 +22,13 @@
 #include <algorithm>
 
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 

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

@@ -19,11 +19,11 @@
 
 #include "Bookmarks.hpp"
 
-#include "database/PlayQueue.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackBookmark.hpp"
-#include "database/User.hpp"
+#include "database/objects/PlayQueue.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"

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

@@ -22,15 +22,15 @@
 #include "core/ILogger.hpp"
 #include "core/Random.hpp"
 #include "core/Service.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/recommendation/IRecommendationService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"

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

@@ -23,12 +23,12 @@
 #include <vector>
 
 #include "core/Service.hpp"
-#include "database/ArtistId.hpp"
-#include "database/Release.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Session.hpp"
-#include "database/TrackId.hpp"
-#include "database/User.hpp"
+#include "database/objects/ArtistId.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/TrackId.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 

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

@@ -27,10 +27,10 @@
 #include "core/String.hpp"
 #include "core/Utils.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImageId.hpp"
-#include "database/TrackLyrics.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImageId.hpp"
+#include "database/objects/TrackLyrics.hpp"
+#include "database/objects/User.hpp"
 #include "services/artwork/IArtworkService.hpp"
 #include "services/transcoding/ITranscodingService.hpp"
 

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

@@ -20,9 +20,9 @@
 #include "Playlists.hpp"
 
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"

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

@@ -24,12 +24,12 @@
 #include <mutex>
 
 #include "core/Random.hpp"
-#include "database/Artist.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 
 #include "ParameterParsing.hpp"
 #include "SubsonicId.hpp"

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

@@ -2,7 +2,7 @@
 
 #include "core/Service.hpp"
 #include "database/Session.hpp"
-#include "database/User.hpp"
+#include "database/objects/User.hpp"
 #include "services/auth/IPasswordService.hpp"
 
 #include "ParameterParsing.hpp"

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

@@ -22,14 +22,14 @@
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/Release.hpp"
-#include "database/Track.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 

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

@@ -19,7 +19,7 @@
 
 #include "AlbumInfo.hpp"
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 #include "RequestContext.hpp"
 

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

@@ -22,11 +22,11 @@
 #include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Release.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 
 #include "CoverArtId.hpp"

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

@@ -19,8 +19,8 @@
 
 #include "responses/Bookmark.hpp"
 
-#include "database/TrackBookmark.hpp"
-#include "database/User.hpp"
+#include "database/objects/TrackBookmark.hpp"
+#include "database/objects/User.hpp"
 
 namespace lms::api::subsonic
 {

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

@@ -20,7 +20,7 @@
 #include "responses/Contributor.hpp"
 
 #include "database/Object.hpp"
-#include "database/TrackArtistLink.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 
 #include "SubsonicResponse.hpp"
 #include "responses/Artist.hpp"

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

@@ -19,7 +19,7 @@
 
 #include "responses/Genre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 #include "RequestContext.hpp"
 

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

@@ -19,7 +19,7 @@
 
 #include "responses/Genre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 namespace lms::api::subsonic
 {

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

@@ -19,7 +19,7 @@
 
 #include "responses/ItemGenre.hpp"
 
-#include "database/Cluster.hpp"
+#include "database/objects/Cluster.hpp"
 
 namespace lms::api::subsonic
 {

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

@@ -19,7 +19,7 @@
 
 #include "responses/Lyrics.hpp"
 
-#include "database/TrackLyrics.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "RequestContext.hpp"
 

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

@@ -21,9 +21,9 @@
 
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artwork.hpp"
-#include "database/TrackList.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/TrackList.hpp"
+#include "database/objects/User.hpp"
 #include "services/artwork/IArtworkService.hpp"
 
 #include "CoverArtId.hpp"

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

@@ -19,7 +19,7 @@
 
 #include "responses/RecordLabel.hpp"
 
-#include "database/Release.hpp"
+#include "database/objects/Release.hpp"
 
 namespace lms::api::subsonic
 {

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

@@ -19,7 +19,7 @@
 
 #include "responses/ReplayGain.hpp"
 
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 namespace lms::api::subsonic
 {

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

@@ -27,16 +27,16 @@
 #include "core/MimeTypes.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
 #include "database/Types.hpp"
-#include "database/User.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/User.hpp"
 #include "services/feedback/IFeedbackService.hpp"
 #include "services/scrobbling/IScrobblingService.hpp"
 

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

@@ -19,8 +19,8 @@
 
 #include "responses/User.hpp"
 
-#include "database/MediaLibrary.hpp"
-#include "database/User.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/User.hpp"
 
 #include "RequestContext.hpp"
 #include "SubsonicId.hpp"