Created an interface for the Db class
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Artist.hpp"
|
||||
#include "database/ArtistInfo.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
#include "database/TrackArtistLink.hpp"
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
#include "database/ArtistInfo.hpp"
|
||||
#include "database/Artwork.hpp"
|
||||
#include "database/ArtworkId.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Image.hpp"
|
||||
#include "database/Release.hpp"
|
||||
#include "database/Session.hpp"
|
||||
@@ -270,7 +270,7 @@ namespace lms::scanner
|
||||
class ComputeArtistArtworkAssociationsJob : public core::IJob
|
||||
{
|
||||
public:
|
||||
ComputeArtistArtworkAssociationsJob(db::Db& db, const SearchArtistArtworkParams& searchParams, db::IdRange<db::ArtistId> artistIdRange)
|
||||
ComputeArtistArtworkAssociationsJob(db::IDb& db, const SearchArtistArtworkParams& searchParams, db::IdRange<db::ArtistId> artistIdRange)
|
||||
: _db{ db }
|
||||
, _searchParams{ searchParams }
|
||||
, _artistIdRange{ artistIdRange }
|
||||
@@ -304,7 +304,7 @@ namespace lms::scanner
|
||||
});
|
||||
}
|
||||
|
||||
db::Db& _db;
|
||||
db::IDb& _db;
|
||||
const SearchArtistArtworkParams& _searchParams;
|
||||
db::IdRange<db::ArtistId> _artistIdRange;
|
||||
std::vector<ArtistArtworkAssociation> _associations;
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
#include <deque>
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
#include "database/TrackLyrics.hpp"
|
||||
|
||||
@@ -25,8 +25,8 @@
|
||||
|
||||
#include "core/IJob.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/PlayListFile.hpp"
|
||||
#include "database/ReleaseId.hpp"
|
||||
#include "database/Session.hpp"
|
||||
@@ -174,7 +174,7 @@ namespace lms::scanner
|
||||
class ComputePlayListFileAssociationsJob : public core::IJob
|
||||
{
|
||||
public:
|
||||
ComputePlayListFileAssociationsJob(db::Db& db, const ScannerSettings& settings, db::IdRange<db::PlayListFileId> playListFileIdRange)
|
||||
ComputePlayListFileAssociationsJob(db::IDb& db, const ScannerSettings& settings, db::IdRange<db::PlayListFileId> playListFileIdRange)
|
||||
: _db{ db }
|
||||
, _settings{ settings }
|
||||
, _playListFileIdRange{ playListFileIdRange }
|
||||
@@ -239,7 +239,7 @@ namespace lms::scanner
|
||||
});
|
||||
}
|
||||
|
||||
db::Db& _db;
|
||||
db::IDb& _db;
|
||||
const ScannerSettings& _settings;
|
||||
db::IdRange<db::PlayListFileId> _playListFileIdRange;
|
||||
std::vector<PlayListFileAssociation> _associations;
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/Path.hpp"
|
||||
#include "database/Artwork.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Image.hpp"
|
||||
#include "database/Release.hpp"
|
||||
#include "database/Session.hpp"
|
||||
@@ -213,7 +213,7 @@ namespace lms::scanner
|
||||
class ComputeReleaseArtworkAssociationsJob : public core::IJob
|
||||
{
|
||||
public:
|
||||
ComputeReleaseArtworkAssociationsJob(db::Db& db, const SearchReleaseArtworkParams& searchParams, db::IdRange<db::ReleaseId> artistIdRange)
|
||||
ComputeReleaseArtworkAssociationsJob(db::IDb& db, const SearchReleaseArtworkParams& searchParams, db::IdRange<db::ReleaseId> artistIdRange)
|
||||
: _db{ db }
|
||||
, _searchParams{ searchParams }
|
||||
, _artistIdRange{ artistIdRange }
|
||||
@@ -247,7 +247,7 @@ namespace lms::scanner
|
||||
});
|
||||
}
|
||||
|
||||
db::Db& _db;
|
||||
db::IDb& _db;
|
||||
const SearchReleaseArtworkParams& _searchParams;
|
||||
db::IdRange<db::ReleaseId> _artistIdRange;
|
||||
std::vector<ReleaseArtworkAssociation> _associations;
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/LiteralString.hpp"
|
||||
#include "database/Artwork.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/IdRange.hpp"
|
||||
#include "database/Image.hpp"
|
||||
#include "database/Release.hpp"
|
||||
@@ -160,7 +160,7 @@ namespace lms::scanner
|
||||
class ComputeTrackArtworkAssociationsJob : public core::IJob
|
||||
{
|
||||
public:
|
||||
ComputeTrackArtworkAssociationsJob(db::Db& db, db::IdRange<db::TrackId> trackIdRange)
|
||||
ComputeTrackArtworkAssociationsJob(db::IDb& db, db::IdRange<db::TrackId> trackIdRange)
|
||||
: _db{ db }
|
||||
, _trackIdRange{ trackIdRange }
|
||||
{
|
||||
@@ -209,7 +209,7 @@ namespace lms::scanner
|
||||
});
|
||||
}
|
||||
|
||||
db::Db& _db;
|
||||
db::IDb& _db;
|
||||
db::IdRange<db::TrackId> _trackIdRange;
|
||||
std::vector<TrackArtworksAssociation> _trackAssociations;
|
||||
std::size_t _processedTrackCount{};
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace lms::core
|
||||
|
||||
namespace lms::db
|
||||
{
|
||||
class Db;
|
||||
class IDb;
|
||||
}
|
||||
|
||||
namespace lms::scanner
|
||||
@@ -56,7 +56,7 @@ namespace lms::scanner
|
||||
const ScannerSettings* lastScanSettings{};
|
||||
ProgressCallback progressCallback;
|
||||
bool& abortScan;
|
||||
db::Db& db;
|
||||
db::IDb& db;
|
||||
std::span<IFileScanner*> fileScanners;
|
||||
};
|
||||
ScanStepBase(InitParams& initParams);
|
||||
@@ -82,7 +82,7 @@ namespace lms::scanner
|
||||
const ScannerSettings& _settings;
|
||||
ProgressCallback _progressCallback;
|
||||
bool& _abortScan;
|
||||
db::Db& _db;
|
||||
db::IDb& _db;
|
||||
|
||||
private:
|
||||
core::IJobScheduler& _jobScheduler;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ScanStepCheckForDuplicatedFiles.hpp"
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/Path.hpp"
|
||||
#include "database/ArtistInfo.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Image.hpp"
|
||||
#include "database/PlayListFile.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "ScanStepCompact.hpp"
|
||||
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
#include "ScanContext.hpp"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ScanStepComputeClusterStats.hpp"
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Cluster.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
#include "ScanContext.hpp"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
#include "ScanStepOptimize.hpp"
|
||||
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
#include "ScanContext.hpp"
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "database/Artist.hpp"
|
||||
#include "database/Cluster.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Release.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "database/Track.hpp"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "core/ILogger.hpp"
|
||||
#include "core/ITraceLogger.hpp"
|
||||
#include "core/Path.hpp"
|
||||
#include "database/Db.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/Session.hpp"
|
||||
#include "scanners/FileToScan.hpp"
|
||||
#include "scanners/IFileScanOperation.hpp"
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
|
||||
#include "ScanStepUpdateLibraryFields.hpp"
|
||||
|
||||
#include "database/Db.hpp"
|
||||
#include "database/Directory.hpp"
|
||||
#include "database/IDb.hpp"
|
||||
#include "database/MediaLibrary.hpp"
|
||||
#include "database/Session.hpp"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user