Renamed namespace cover to artwork
This commit is contained in:
@@ -36,7 +36,7 @@
|
|||||||
#include "image/Image.hpp"
|
#include "image/Image.hpp"
|
||||||
#include "metadata/IAudioFileParser.hpp"
|
#include "metadata/IAudioFileParser.hpp"
|
||||||
|
|
||||||
namespace lms::cover
|
namespace lms::artwork
|
||||||
{
|
{
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
@@ -382,4 +382,4 @@ namespace lms::cover
|
|||||||
|
|
||||||
LMS_LOG(COVER, INFO, "JPEG export quality = " << _jpegQuality);
|
LMS_LOG(COVER, INFO, "JPEG export quality = " << _jpegQuality);
|
||||||
}
|
}
|
||||||
} // namespace lms::cover
|
} // namespace lms::artwork
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace lms::metadata
|
|||||||
class IAudioFileParser;
|
class IAudioFileParser;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace lms::cover
|
namespace lms::artwork
|
||||||
{
|
{
|
||||||
class ArtworkService : public IArtworkService
|
class ArtworkService : public IArtworkService
|
||||||
{
|
{
|
||||||
@@ -76,4 +76,4 @@ namespace lms::cover
|
|||||||
unsigned _jpegQuality;
|
unsigned _jpegQuality;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace lms::cover
|
} // namespace lms::artwork
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
#include "core/ILogger.hpp"
|
#include "core/ILogger.hpp"
|
||||||
#include "core/Random.hpp"
|
#include "core/Random.hpp"
|
||||||
|
|
||||||
namespace lms::cover
|
namespace lms::artwork
|
||||||
{
|
{
|
||||||
ImageCache::ImageCache(std::size_t maxCacheSize)
|
ImageCache::ImageCache(std::size_t maxCacheSize)
|
||||||
: _maxCacheSize{ maxCacheSize }
|
: _maxCacheSize{ maxCacheSize }
|
||||||
@@ -79,4 +79,4 @@ namespace lms::cover
|
|||||||
_cacheSize = 0;
|
_cacheSize = 0;
|
||||||
_cache.clear();
|
_cache.clear();
|
||||||
}
|
}
|
||||||
} // namespace lms::cover
|
} // namespace lms::artwork
|
||||||
@@ -31,7 +31,7 @@
|
|||||||
#include "database/TrackEmbeddedImageId.hpp"
|
#include "database/TrackEmbeddedImageId.hpp"
|
||||||
#include "image/IEncodedImage.hpp"
|
#include "image/IEncodedImage.hpp"
|
||||||
|
|
||||||
namespace lms::cover
|
namespace lms::artwork
|
||||||
{
|
{
|
||||||
class ImageCache
|
class ImageCache
|
||||||
{
|
{
|
||||||
@@ -72,4 +72,4 @@ namespace lms::cover
|
|||||||
mutable std::atomic<std::size_t> _cacheMisses{};
|
mutable std::atomic<std::size_t> _cacheMisses{};
|
||||||
mutable std::atomic<std::size_t> _cacheHits{};
|
mutable std::atomic<std::size_t> _cacheHits{};
|
||||||
};
|
};
|
||||||
} // namespace lms::cover
|
} // namespace lms::artwork
|
||||||
@@ -37,7 +37,7 @@ namespace lms::db
|
|||||||
class Db;
|
class Db;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace lms::cover
|
namespace lms::artwork
|
||||||
{
|
{
|
||||||
class IArtworkService
|
class IArtworkService
|
||||||
{
|
{
|
||||||
@@ -73,4 +73,4 @@ namespace lms::cover
|
|||||||
|
|
||||||
std::unique_ptr<IArtworkService> createArtworkService(db::Db& db, const std::filesystem::path& defaultReleaseCoverSvgPath, const std::filesystem::path& defaultArtistImageSvgPath);
|
std::unique_ptr<IArtworkService> createArtworkService(db::Db& db, const std::filesystem::path& defaultReleaseCoverSvgPath, const std::filesystem::path& defaultArtistImageSvgPath);
|
||||||
|
|
||||||
} // namespace lms::cover
|
} // namespace lms::artwork
|
||||||
|
|||||||
@@ -338,9 +338,9 @@ namespace lms::api::subsonic
|
|||||||
|
|
||||||
std::shared_ptr<image::IEncodedImage> image;
|
std::shared_ptr<image::IEncodedImage> image;
|
||||||
if (const db::TrackEmbeddedImageId * trackEmbeddedImageId{ std::get_if<db::TrackEmbeddedImageId>(&coverArtId.id) })
|
if (const db::TrackEmbeddedImageId * trackEmbeddedImageId{ std::get_if<db::TrackEmbeddedImageId>(&coverArtId.id) })
|
||||||
image = core::Service<cover::IArtworkService>::get()->getTrackEmbeddedImage(*trackEmbeddedImageId, size);
|
image = core::Service<artwork::IArtworkService>::get()->getTrackEmbeddedImage(*trackEmbeddedImageId, size);
|
||||||
else if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&coverArtId.id) })
|
else if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&coverArtId.id) })
|
||||||
image = core::Service<cover::IArtworkService>::get()->getImage(*imageId, size);
|
image = core::Service<artwork::IArtworkService>::get()->getImage(*imageId, size);
|
||||||
|
|
||||||
if (!image)
|
if (!image)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ namespace lms::api::subsonic
|
|||||||
albumNode.setAttribute("created", core::stringUtils::toISO8601String(release->getAddedTime()));
|
albumNode.setAttribute("created", core::stringUtils::toISO8601String(release->getAddedTime()));
|
||||||
|
|
||||||
{
|
{
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findReleaseImage(release->getId()) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findReleaseImage(release->getId()) };
|
||||||
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
||||||
{
|
{
|
||||||
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ namespace lms::api::subsonic
|
|||||||
artistNode.setAttribute("id", idToString(artist->getId()));
|
artistNode.setAttribute("id", idToString(artist->getId()));
|
||||||
artistNode.setAttribute("name", artist->getName());
|
artistNode.setAttribute("name", artist->getName());
|
||||||
{
|
{
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findArtistImage(artist->getId()) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findArtistImage(artist->getId()) };
|
||||||
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
||||||
{
|
{
|
||||||
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ namespace lms::api::subsonic
|
|||||||
playlistNode.setAttribute("owner", user->getLoginName());
|
playlistNode.setAttribute("owner", user->getLoginName());
|
||||||
|
|
||||||
{
|
{
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findTrackListImage(tracklist->getId()) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findTrackListImage(tracklist->getId()) };
|
||||||
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
||||||
{
|
{
|
||||||
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ namespace lms::api::subsonic
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findTrackImage(track->getId()) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findTrackImage(track->getId()) };
|
||||||
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
if (const db::ImageId * imageId{ std::get_if<db::ImageId>(&imageResult) })
|
||||||
{
|
{
|
||||||
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
if (const db::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
|
||||||
|
|||||||
+1
-1
@@ -370,7 +370,7 @@ namespace lms
|
|||||||
}
|
}
|
||||||
|
|
||||||
image::init(argv[0]);
|
image::init(argv[0]);
|
||||||
core::Service<cover::IArtworkService> artworkService{ cover::createArtworkService(database, server.appRoot() + "/images/unknown-cover.svg", server.appRoot() + "/images/unknown-artist.svg") };
|
core::Service<artwork::IArtworkService> artworkService{ artwork::createArtworkService(database, server.appRoot() + "/images/unknown-cover.svg", server.appRoot() + "/images/unknown-artist.svg") };
|
||||||
core::Service<recommendation::IRecommendationService> recommendationService{ recommendation::createRecommendationService(database) };
|
core::Service<recommendation::IRecommendationService> recommendationService{ recommendation::createRecommendationService(database) };
|
||||||
core::Service<recommendation::IPlaylistGeneratorService> playlistGeneratorService{ recommendation::createPlaylistGeneratorService(database, *recommendationService.get()) };
|
core::Service<recommendation::IPlaylistGeneratorService> playlistGeneratorService{ recommendation::createPlaylistGeneratorService(database, *recommendationService.get()) };
|
||||||
core::Service<scanner::IScannerService> scannerService{ scanner::createScannerService(database) };
|
core::Service<scanner::IScannerService> scannerService{ scanner::createScannerService(database) };
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace lms::ui
|
|||||||
{
|
{
|
||||||
std::string url;
|
std::string url;
|
||||||
|
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findArtistImage(artistId) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findArtistImage(artistId) };
|
||||||
std::visit([&](const auto& arg) {
|
std::visit([&](const auto& arg) {
|
||||||
using T = std::decay_t<decltype(arg)>;
|
using T = std::decay_t<decltype(arg)>;
|
||||||
if constexpr (std::is_same_v<T, std::monostate>)
|
if constexpr (std::is_same_v<T, std::monostate>)
|
||||||
@@ -68,7 +68,7 @@ namespace lms::ui
|
|||||||
{
|
{
|
||||||
std::string url;
|
std::string url;
|
||||||
|
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findReleaseImage(releaseId) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findReleaseImage(releaseId) };
|
||||||
std::visit([&](const auto& arg) {
|
std::visit([&](const auto& arg) {
|
||||||
using T = std::decay_t<decltype(arg)>;
|
using T = std::decay_t<decltype(arg)>;
|
||||||
if constexpr (std::is_same_v<T, std::monostate>)
|
if constexpr (std::is_same_v<T, std::monostate>)
|
||||||
@@ -85,7 +85,7 @@ namespace lms::ui
|
|||||||
{
|
{
|
||||||
std::string url;
|
std::string url;
|
||||||
|
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findTrackImage(trackId) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findTrackImage(trackId) };
|
||||||
std::visit([&](const auto& arg) {
|
std::visit([&](const auto& arg) {
|
||||||
using T = std::decay_t<decltype(arg)>;
|
using T = std::decay_t<decltype(arg)>;
|
||||||
if constexpr (std::is_same_v<T, std::monostate>)
|
if constexpr (std::is_same_v<T, std::monostate>)
|
||||||
@@ -102,7 +102,7 @@ namespace lms::ui
|
|||||||
{
|
{
|
||||||
std::string url;
|
std::string url;
|
||||||
|
|
||||||
const auto imageResult{ core::Service<cover::IArtworkService>::get()->findTrackMediaImage(trackId) };
|
const auto imageResult{ core::Service<artwork::IArtworkService>::get()->findTrackMediaImage(trackId) };
|
||||||
std::visit([&](const auto& arg) {
|
std::visit([&](const auto& arg) {
|
||||||
using T = std::decay_t<decltype(arg)>;
|
using T = std::decay_t<decltype(arg)>;
|
||||||
if constexpr (!std::is_same_v<T, std::monostate>)
|
if constexpr (!std::is_same_v<T, std::monostate>)
|
||||||
@@ -164,21 +164,21 @@ namespace lms::ui
|
|||||||
if (imageIdStr)
|
if (imageIdStr)
|
||||||
{
|
{
|
||||||
if (const auto imageId{ core::stringUtils::readAs<db::ImageId::ValueType>(*imageIdStr) })
|
if (const auto imageId{ core::stringUtils::readAs<db::ImageId::ValueType>(*imageIdStr) })
|
||||||
image = core::Service<cover::IArtworkService>::get()->getImage(*imageId, size);
|
image = core::Service<artwork::IArtworkService>::get()->getImage(*imageId, size);
|
||||||
}
|
}
|
||||||
else if (trackEmbeddedImageIdStr)
|
else if (trackEmbeddedImageIdStr)
|
||||||
{
|
{
|
||||||
if (const auto imageId{ core::stringUtils::readAs<db::TrackEmbeddedImageId::ValueType>(*trackEmbeddedImageIdStr) })
|
if (const auto imageId{ core::stringUtils::readAs<db::TrackEmbeddedImageId::ValueType>(*trackEmbeddedImageIdStr) })
|
||||||
image = core::Service<cover::IArtworkService>::get()->getTrackEmbeddedImage(*imageId, size);
|
image = core::Service<artwork::IArtworkService>::get()->getTrackEmbeddedImage(*imageId, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!image && typeStr)
|
if (!image && typeStr)
|
||||||
{
|
{
|
||||||
if (*typeStr == "release")
|
if (*typeStr == "release")
|
||||||
image = core::Service<cover::IArtworkService>::get()->getDefaultReleaseCover();
|
image = core::Service<artwork::IArtworkService>::get()->getDefaultReleaseCover();
|
||||||
else if (*typeStr == "artist")
|
else if (*typeStr == "artist")
|
||||||
image = core::Service<cover::IArtworkService>::get()->getDefaultArtistImage();
|
image = core::Service<artwork::IArtworkService>::get()->getDefaultArtistImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (image)
|
if (image)
|
||||||
|
|||||||
Reference in New Issue
Block a user