Placed db object related files in a subdirectory

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

@@ -21,7 +21,7 @@
 
 #include <filesystem>
 
-#include "database/MediaLibraryId.hpp"
+#include "database/objects/MediaLibraryId.hpp"
 
 namespace lms::scanner
 {

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

@@ -27,9 +27,9 @@
 #include "core/IJobScheduler.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/ScanSettings.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "scanners/ArtistInfoFileScanner.hpp"
 #include "scanners/AudioFileScanner.hpp"

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

@@ -25,7 +25,7 @@
 
 #include <Wt/WDateTime.h>
 
-#include "database/ScanSettings.hpp"
+#include "database/objects/ScanSettings.hpp"
 
 #include "MediaLibraryInfo.hpp"
 

src/libs/services/scanner/impl/helpers/ArtistHelpers.hpp

@@ -20,7 +20,7 @@
 #pragma once
 
 #include "core/TaggedType.hpp"
-#include "database/Artist.hpp"
+#include "database/objects/Artist.hpp"
 
 namespace lms::metadata
 {

src/libs/services/scanner/impl/scanners/ArtistInfoFileScanner.cpp

@@ -24,11 +24,11 @@
 
 #include "core/ILogger.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "metadata/ArtistInfo.hpp"
 #include "metadata/Types.hpp"
 #include "services/scanner/ScanErrors.hpp"

src/libs/services/scanner/impl/scanners/AudioFileScanOperation.cpp

@@ -24,21 +24,21 @@
 #include "core/PartialDateTime.hpp"
 #include "core/Path.hpp"
 #include "core/XxHash3.hpp"
-#include "database/Artist.hpp"
-#include "database/Artwork.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackEmbeddedImage.hpp"
-#include "database/TrackEmbeddedImageLink.hpp"
-#include "database/TrackFeatures.hpp"
-#include "database/TrackLyrics.hpp"
 #include "database/Types.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/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackFeatures.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "image/Exception.hpp"
 #include "image/Image.hpp"
 #include "metadata/Exception.hpp"

src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp

@@ -22,9 +22,9 @@
 #include "core/IConfig.hpp"
 #include "core/Service.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Track.hpp"
 #include "metadata/IAudioFileParser.hpp"
 
 #include "AudioFileScanOperation.hpp"

src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp

@@ -22,11 +22,12 @@
 #include <optional>
 
 #include "core/ILogger.hpp"
-#include "database/Artwork.hpp"
+
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "image/Exception.hpp"
 #include "image/Image.hpp"
 #include "services/scanner/ScanErrors.hpp"

src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp

@@ -26,9 +26,9 @@
 #include "ScannerSettings.hpp"
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "metadata/Lyrics.hpp"
 #include "services/scanner/ScanErrors.hpp"
 

src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp

@@ -24,9 +24,9 @@
 
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
+#include "database/objects/MediaLibrary.hpp"
+#include "database/objects/PlayListFile.hpp"
 #include "metadata/Exception.hpp"
 #include "metadata/PlayList.hpp"
 

src/libs/services/scanner/impl/scanners/Utils.cpp

@@ -22,9 +22,9 @@
 #include <system_error>
 
 #include "core/Path.hpp"
-#include "database/Directory.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 namespace lms::scanner::utils
 {

src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp

@@ -23,13 +23,13 @@
 #include <ostream>
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackArtistLink.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackList.hpp"
 #include "metadata/Types.hpp"
 
 #include "ScanContext.hpp"

src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp

@@ -30,16 +30,16 @@
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
 #include "core/String.hpp"
-#include "database/Artist.hpp"
-#include "database/ArtistInfo.hpp"
-#include "database/Artwork.hpp"
-#include "database/ArtworkId.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/ArtworkId.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"

src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp

@@ -22,11 +22,11 @@
 #include <deque>
 
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "ScanContext.hpp"
 

src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp

@@ -25,13 +25,13 @@
 
 #include "core/IJob.hpp"
 #include "core/ILogger.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/PlayListFile.hpp"
-#include "database/ReleaseId.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackList.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/ReleaseId.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackList.hpp"
 #include "services/scanner/ScanErrors.hpp"
 
 #include "JobQueue.hpp"

src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp

@@ -28,14 +28,14 @@
 #include "core/IJob.hpp"
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"

src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp

@@ -27,15 +27,15 @@
 #include "core/IJobScheduler.hpp"
 #include "core/ILogger.hpp"
 #include "core/LiteralString.hpp"
-#include "database/Artwork.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
 #include "database/IdRange.hpp"
-#include "database/Image.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artwork.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "JobQueue.hpp"
 #include "ScanContext.hpp"

src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp

@@ -22,7 +22,7 @@
 #include "core/ILogger.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
+#include "database/objects/Track.hpp"
 
 #include "ScanContext.hpp"
 

src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp

@@ -23,13 +23,13 @@
 
 #include "core/ILogger.hpp"
 #include "core/Path.hpp"
-#include "database/ArtistInfo.hpp"
 #include "database/IDb.hpp"
-#include "database/Image.hpp"
-#include "database/PlayListFile.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackLyrics.hpp"
+#include "database/objects/ArtistInfo.hpp"
+#include "database/objects/Image.hpp"
+#include "database/objects/PlayListFile.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
 #include "ScanContext.hpp"
 #include "ScannerSettings.hpp"

src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp

@@ -19,9 +19,9 @@
 
 #include "ScanStepComputeClusterStats.hpp"
 #include "core/ILogger.hpp"
-#include "database/Cluster.hpp"
 #include "database/IDb.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Cluster.hpp"
 
 #include "ScanContext.hpp"
 

src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp

@@ -20,14 +20,14 @@
 #include "ScanStepRemoveOrphanedDbEntries.hpp"
 
 #include "core/ILogger.hpp"
-#include "database/Artist.hpp"
-#include "database/Cluster.hpp"
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/Release.hpp"
 #include "database/Session.hpp"
-#include "database/Track.hpp"
-#include "database/TrackEmbeddedImage.hpp"
+#include "database/objects/Artist.hpp"
+#include "database/objects/Cluster.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/Release.hpp"
+#include "database/objects/Track.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
 
 #include "ScanContext.hpp"
 

src/libs/services/scanner/impl/steps/ScanStepUpdateLibraryFields.cpp

@@ -19,10 +19,10 @@
 
 #include "ScanStepUpdateLibraryFields.hpp"
 
-#include "database/Directory.hpp"
 #include "database/IDb.hpp"
-#include "database/MediaLibrary.hpp"
 #include "database/Session.hpp"
+#include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 
 #include "MediaLibraryInfo.hpp"
 #include "ScanContext.hpp"

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

@@ -24,7 +24,7 @@
 #include <memory>
 #include <vector>
 
-#include "database/TrackId.hpp"
+#include "database/objects/TrackId.hpp"
 
 #include "ScanErrors.hpp"