owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed namespace cover to artwork

Browse Source
This commit is contained in:
emeric
2025-06-15 14:41:58 +02:00
parent 3a7f010a7d
commit f657427654
12 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/artwork/impl/ArtworkService.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "image/Image.hpp"
#include "metadata/IAudioFileParser.hpp"
namespace lms::cover
namespace lms::artwork
{
namespace
{
@@ -382,4 +382,4 @@ namespace lms::cover
LMS_LOG(COVER, INFO, "JPEG export quality = " << _jpegQuality);
}
} // namespace lms::cover
} // namespace lms::artwork
src/libs/services/artwork/impl/ArtworkService.hpp
+2 -2
View File
@@ -36,7 +36,7 @@ namespace lms::metadata
class IAudioFileParser;
}
namespace lms::cover
namespace lms::artwork
{
class ArtworkService : public IArtworkService
{
@@ -76,4 +76,4 @@ namespace lms::cover
unsigned _jpegQuality;
};
} // namespace lms::cover
} // namespace lms::artwork
src/libs/services/artwork/impl/ImageCache.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "core/ILogger.hpp"
#include "core/Random.hpp"
namespace lms::cover
namespace lms::artwork
{
ImageCache::ImageCache(std::size_t maxCacheSize)
: _maxCacheSize{ maxCacheSize }
@@ -79,4 +79,4 @@ namespace lms::cover
_cacheSize = 0;
_cache.clear();
}
} // namespace lms::cover
} // namespace lms::artwork
src/libs/services/artwork/impl/ImageCache.hpp
+2 -2
View File
@@ -31,7 +31,7 @@
#include "database/TrackEmbeddedImageId.hpp"
#include "image/IEncodedImage.hpp"
namespace lms::cover
namespace lms::artwork
{
class ImageCache
{
@@ -72,4 +72,4 @@ namespace lms::cover
mutable std::atomic<std::size_t> _cacheMisses{};
mutable std::atomic<std::size_t> _cacheHits{};
};
} // namespace lms::cover
} // namespace lms::artwork
src/libs/services/artwork/include/services/artwork/IArtworkService.hpp
+2 -2
View File
@@ -37,7 +37,7 @@ namespace lms::db
class Db;
}
namespace lms::cover
namespace lms::artwork
{
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);
} // namespace lms::cover
} // namespace lms::artwork
src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp
+2 -2
View File
@@ -338,9 +338,9 @@ namespace lms::api::subsonic
std::shared_ptr<image::IEncodedImage> image;
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) })
image = core::Service<cover::IArtworkService>::get()->getImage(*imageId, size);
image = core::Service<artwork::IArtworkService>::get()->getImage(*imageId, size);
if (!image)
{
src/libs/subsonic/impl/responses/Album.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ namespace lms::api::subsonic
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::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
src/libs/subsonic/impl/responses/Artist.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ namespace lms::api::subsonic
artistNode.setAttribute("id", idToString(artist->getId()));
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::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
src/libs/subsonic/impl/responses/Playlist.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ namespace lms::api::subsonic
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::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
src/libs/subsonic/impl/responses/Song.cpp
+1 -1
View File
@@ -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::Image::pointer image{ db::Image::find(context.dbSession, *imageId) })
src/lms/main.cpp
+1 -1
View File
@@ -370,7 +370,7 @@ namespace lms
}
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::IPlaylistGeneratorService> playlistGeneratorService{ recommendation::createPlaylistGeneratorService(database, *recommendationService.get()) };
core::Service<scanner::IScannerService> scannerService{ scanner::createScannerService(database) };
src/lms/ui/resource/ArtworkResource.cpp
+8 -8
View File
@@ -51,7 +51,7 @@ namespace lms::ui
{
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) {
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, std::monostate>)
@@ -68,7 +68,7 @@ namespace lms::ui
{
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) {
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, std::monostate>)
@@ -85,7 +85,7 @@ namespace lms::ui
{
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) {
using T = std::decay_t<decltype(arg)>;
if constexpr (std::is_same_v<T, std::monostate>)
@@ -102,7 +102,7 @@ namespace lms::ui
{
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) {
using T = std::decay_t<decltype(arg)>;
if constexpr (!std::is_same_v<T, std::monostate>)
@@ -164,21 +164,21 @@ namespace lms::ui
if (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)
{
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 (*typeStr == "release")
image = core::Service<cover::IArtworkService>::get()->getDefaultReleaseCover();
image = core::Service<artwork::IArtworkService>::get()->getDefaultReleaseCover();
else if (*typeStr == "artist")
image = core::Service<cover::IArtworkService>::get()->getDefaultArtistImage();
image = core::Service<artwork::IArtworkService>::get()->getDefaultArtistImage();
}
if (image)