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

Changed the artists view to use artist images

Browse Source
This commit is contained in:
emeric
2024-10-11 19:04:59 +02:00
parent e9f533bb6b
commit 8bdf3b42d0
33 changed files with 439 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/services/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
add_subdirectory(artwork)
add_subdirectory(auth)
add_subdirectory(cover)
add_subdirectory(feedback)
add_subdirectory(recommendation)
add_subdirectory(scanner)
src/libs/services/artwork/CMakeLists.txt
+29
View File
@@ -0,0 +1,29 @@
add_library(lmsartwork SHARED
impl/ImageCache.cpp
impl/ArtworkService.cpp
)
target_include_directories(lmsartwork INTERFACE
include
)
target_include_directories(lmsartwork PRIVATE
include
impl
)
target_link_libraries(lmsartwork PRIVATE
lmsav
lmsimage
)
target_link_libraries(lmsartwork PUBLIC
lmsdatabase
lmsimage
lmscore
std::filesystem
)
install(TARGETS lmsartwork DESTINATION ${CMAKE_INSTALL_LIBDIR})
src/libs/services/cover/impl/CoverService.cpp → src/libs/services/artwork/impl/ArtworkService.cpp
+26 -19
View File
@@ -17,7 +17,7 @@
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
*/
#include "CoverService.hpp"
#include "ArtworkService.hpp"
#include "av/IAudioFile.hpp"
#include "core/IConfig.hpp"
@@ -45,27 +45,29 @@ namespace lms::cover
}
} // namespace
std::unique_ptr<ICoverService> createCoverService(db::Db& db, const std::filesystem::path& defaultSvgCoverPath)
std::unique_ptr<IArtworkService> createArtworkService(db::Db& db, const std::filesystem::path& defaultReleaseCoverSvgPath, const std::filesystem::path& defaultArtistImageSvgPath)
{
return std::make_unique<CoverService>(db, defaultSvgCoverPath);
return std::make_unique<ArtworkService>(db, defaultReleaseCoverSvgPath, defaultArtistImageSvgPath);
}
using namespace image;
CoverService::CoverService(db::Db& db,
const std::filesystem::path& defaultSvgCoverPath)
ArtworkService::ArtworkService(db::Db& db,
const std::filesystem::path& defaultReleaseCoverSvgPath,
const std::filesystem::path& defaultArtistImageSvgPath)
: _db{ db }
, _cache{ core::Service<core::IConfig>::get()->getULong("cover-max-cache-size", 30) * 1000 * 1000 }
{
setJpegQuality(core::Service<core::IConfig>::get()->getULong("cover-jpeg-quality", 75));
LMS_LOG(COVER, INFO, "Default cover path = '" << defaultSvgCoverPath.string() << "'");
LMS_LOG(COVER, INFO, "Default release cover path = '" << defaultReleaseCoverSvgPath.string() << "'");
LMS_LOG(COVER, INFO, "Max cache size = " << _cache.getMaxCacheSize());
_defaultCover = image::readSvgFile(defaultSvgCoverPath); // may throw
_defaultReleaseCover = image::readSvgFile(defaultReleaseCoverSvgPath); // may throw
_defaultArtistImage = image::readSvgFile(defaultArtistImageSvgPath); // may throw
}
std::unique_ptr<IEncodedImage> CoverService::getFromAvMediaFile(const av::IAudioFile& input, ImageSize width) const
std::unique_ptr<IEncodedImage> ArtworkService::getFromAvMediaFile(const av::IAudioFile& input, ImageSize width) const
{
std::unique_ptr<IEncodedImage> image;
@@ -88,7 +90,7 @@ namespace lms::cover
return image;
}
std::unique_ptr<IEncodedImage> CoverService::getFromImageFile(const std::filesystem::path& p, ImageSize width) const
std::unique_ptr<IEncodedImage> ArtworkService::getFromImageFile(const std::filesystem::path& p, ImageSize width) const
{
std::unique_ptr<IEncodedImage> image;
@@ -106,12 +108,17 @@ namespace lms::cover
return image;
}
std::shared_ptr<IEncodedImage> CoverService::getDefaultSvgCover()
std::shared_ptr<IEncodedImage> ArtworkService::getDefaultReleaseCover()
{
return _defaultCover;
return _defaultReleaseCover;
}
bool CoverService::checkImageFile(const std::filesystem::path& filePath) const
std::shared_ptr<IEncodedImage> ArtworkService::getDefaultArtistImage()
{
return _defaultArtistImage;
}
bool ArtworkService::checkImageFile(const std::filesystem::path& filePath) const
{
std::error_code ec;
@@ -127,7 +134,7 @@ namespace lms::cover
return true;
}
std::unique_ptr<IEncodedImage> CoverService::getFromTrack(const std::filesystem::path& p, ImageSize width) const
std::unique_ptr<IEncodedImage> ArtworkService::getTrackImage(const std::filesystem::path& p, ImageSize width) const
{
std::unique_ptr<IEncodedImage> image;
@@ -143,7 +150,7 @@ namespace lms::cover
return image;
}
std::shared_ptr<IEncodedImage> CoverService::getFromTrack(db::TrackId trackId, ImageSize width)
std::shared_ptr<IEncodedImage> ArtworkService::getTrackImage(db::TrackId trackId, ImageSize width)
{
const ImageCache::EntryDesc cacheEntryDesc{ trackId, width };
@@ -157,7 +164,7 @@ namespace lms::cover
const db::Track::pointer track{ db::Track::find(session, trackId) };
if (track && track->hasCover())
cover = getFromTrack(track->getAbsoluteFilePath(), width);
cover = getTrackImage(track->getAbsoluteFilePath(), width);
}
if (cover)
@@ -166,7 +173,7 @@ namespace lms::cover
return cover;
}
std::shared_ptr<IEncodedImage> CoverService::getFromRelease(db::ReleaseId releaseId, ImageSize width)
std::shared_ptr<IEncodedImage> ArtworkService::getReleaseCover(db::ReleaseId releaseId, ImageSize width)
{
using namespace db;
const ImageCache::EntryDesc cacheEntryDesc{ releaseId, width };
@@ -193,7 +200,7 @@ namespace lms::cover
return image;
}
std::shared_ptr<IEncodedImage> CoverService::getFromArtist(db::ArtistId artistId, ImageSize width)
std::shared_ptr<IEncodedImage> ArtworkService::getArtistImage(db::ArtistId artistId, ImageSize width)
{
using namespace db;
const ImageCache::EntryDesc cacheEntryDesc{ artistId, width };
@@ -220,12 +227,12 @@ namespace lms::cover
return artistImage;
}
void CoverService::flushCache()
void ArtworkService::flushCache()
{
_cache.flush();
}
void CoverService::setJpegQuality(unsigned quality)
void ArtworkService::setJpegQuality(unsigned quality)
{
_jpegQuality = core::utils::clamp<unsigned>(quality, 1, 100);
src/libs/services/cover/impl/CoverService.hpp → src/libs/services/artwork/impl/ArtworkService.hpp
+15 -12
View File
@@ -24,7 +24,7 @@
#include "database/Types.hpp"
#include "image/IEncodedImage.hpp"
#include "services/cover/ICoverService.hpp"
#include "services/artwork/IArtworkService.hpp"
#include "ImageCache.hpp"
@@ -40,34 +40,37 @@ namespace lms::av
namespace lms::cover
{
class CoverService : public ICoverService
class ArtworkService : public IArtworkService
{
public:
CoverService(db::Db& db, const std::filesystem::path& defaultSvgCoverPath);
ArtworkService(db::Db& db, const std::filesystem::path& defaultSvgCoverPath, const std::filesystem::path& defaultArtistImageSvgPath);
private:
CoverService(const CoverService&) = delete;
CoverService& operator=(const CoverService&) = delete;
ArtworkService(const ArtworkService&) = delete;
ArtworkService& operator=(const ArtworkService&) = delete;
std::shared_ptr<image::IEncodedImage> getTrackImage(db::TrackId trackId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getReleaseCover(db::ReleaseId releaseId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getArtistImage(db::ArtistId artistId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getDefaultReleaseCover() override;
std::shared_ptr<image::IEncodedImage> getDefaultArtistImage() override;
std::shared_ptr<image::IEncodedImage> getFromTrack(db::TrackId trackId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getFromRelease(db::ReleaseId releaseId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getFromArtist(db::ArtistId artistId, image::ImageSize width) override;
std::shared_ptr<image::IEncodedImage> getDefaultSvgCover() override;
void flushCache() override;
void setJpegQuality(unsigned quality) override;
std::shared_ptr<image::IEncodedImage> getFromTrack(db::Session& dbSession, db::TrackId trackId, image::ImageSize width, bool allowReleaseFallback);
std::shared_ptr<image::IEncodedImage> getTrackImage(db::Session& dbSession, db::TrackId trackId, image::ImageSize width, bool allowReleaseFallback);
std::unique_ptr<image::IEncodedImage> getFromAvMediaFile(const av::IAudioFile& input, image::ImageSize width) const;
std::unique_ptr<image::IEncodedImage> getFromImageFile(const std::filesystem::path& p, image::ImageSize width) const;
std::unique_ptr<image::IEncodedImage> getFromTrack(const std::filesystem::path& path, image::ImageSize width) const;
std::unique_ptr<image::IEncodedImage> getTrackImage(const std::filesystem::path& path, image::ImageSize width) const;
bool checkImageFile(const std::filesystem::path& filePath) const;
db::Db& _db;
ImageCache _cache;
std::shared_ptr<image::IEncodedImage> _defaultCover;
std::shared_ptr<image::IEncodedImage> _defaultReleaseCover;
std::shared_ptr<image::IEncodedImage> _defaultArtistImage;
static inline const std::vector<std::filesystem::path> _fileExtensions{ ".jpg", ".jpeg", ".png", ".bmp" }; // TODO parametrize
unsigned _jpegQuality;
src/libs/services/cover/impl/ImageCache.cpp → src/libs/services/artwork/impl/ImageCache.cpp
View File
src/libs/services/cover/impl/ImageCache.hpp → src/libs/services/artwork/impl/ImageCache.hpp
View File
src/libs/services/cover/include/services/cover/ICoverService.hpp → src/libs/services/artwork/include/services/artwork/IArtworkService.hpp
+9 -7
View File
@@ -34,26 +34,28 @@ namespace lms::db
namespace lms::cover
{
class ICoverService
class IArtworkService
{
public:
virtual ~ICoverService() = default;
virtual ~IArtworkService() = default;
virtual std::shared_ptr<image::IEncodedImage> getFromArtist(db::ArtistId artistId, image::ImageSize width) = 0;
virtual std::shared_ptr<image::IEncodedImage> getArtistImage(db::ArtistId artistId, image::ImageSize width) = 0;
// no logic to fallback to release here
virtual std::shared_ptr<image::IEncodedImage> getFromTrack(db::TrackId trackId, image::ImageSize width) = 0;
virtual std::shared_ptr<image::IEncodedImage> getTrackImage(db::TrackId trackId, image::ImageSize width) = 0;
// no logic to fallback to track here
virtual std::shared_ptr<image::IEncodedImage> getFromRelease(db::ReleaseId releaseId, image::ImageSize width) = 0;
virtual std::shared_ptr<image::IEncodedImage> getReleaseCover(db::ReleaseId releaseId, image::ImageSize width) = 0;
virtual std::shared_ptr<image::IEncodedImage> getDefaultSvgCover() = 0;
// Svg images dont have image "size"
virtual std::shared_ptr<image::IEncodedImage> getDefaultReleaseCover() = 0;
virtual std::shared_ptr<image::IEncodedImage> getDefaultArtistImage() = 0;
virtual void flushCache() = 0;
virtual void setJpegQuality(unsigned quality) = 0; // from 1 to 100
};
std::unique_ptr<ICoverService> createCoverService(db::Db& db, const std::filesystem::path& defaultSvgCoverPath);
std::unique_ptr<IArtworkService> createArtworkService(db::Db& db, const std::filesystem::path& defaultSvgCoverPath, const std::filesystem::path& defaultArtistImageSvgPath);
} // namespace lms::cover
src/libs/services/cover/CMakeLists.txt
-29
View File
@@ -1,29 +0,0 @@
add_library(lmsservice-cover SHARED
impl/ImageCache.cpp
impl/CoverService.cpp
)
target_include_directories(lmsservice-cover INTERFACE
include
)
target_include_directories(lmsservice-cover PRIVATE
include
impl
)
target_link_libraries(lmsservice-cover PRIVATE
lmsav
lmsimage
)
target_link_libraries(lmsservice-cover PUBLIC
lmsdatabase
lmsimage
lmscore
std::filesystem
)
install(TARGETS lmsservice-cover DESTINATION ${CMAKE_INSTALL_LIBDIR})