[Image] Improved cover art handling

src/ui/audio/desktop/PlayQueue.cpp

@@ -389,10 +389,7 @@ PlayQueue::addTracks(const std::vector<Database::Track::id_type>& trackIds)
 			_model->setData(dataRow, COLUMN_ID_TRACK_ID, track.id(), Wt::UserRole);
 
 			std::string coverUrl;
-			if (track->getCoverType() != Track::CoverType::None)
-				coverUrl = LmsApplication::instance()->getCoverResource()->getTrackUrl(track.id(), 64);
-			else
-				coverUrl = LmsApplication::instance()->getCoverResource()->getUnknownTrackUrl(64);
+			coverUrl = LmsApplication::instance()->getCoverResource()->getTrackUrl(track.id(), 64);
 
 			_model->setData(dataRow, COLUMN_ID_COVER, coverUrl, Wt::DecorationRole);
 			_model->setData(dataRow, COLUMN_ID_COVER, std::string("playqueue-cover"), Wt::StyleClassRole);

src/ui/resource/CoverResource.cpp

@@ -41,28 +41,21 @@ CoverResource:: ~CoverResource()
 	beingDeleted();
 }
 
-const CoverArt::CoverArt&
+const Image::Image&
 CoverResource::getDefaultCover(std::size_t size)
 {
 	auto itCover = _defaultCovers.find(size);
 	if (itCover == _defaultCovers.end())
 	{
 		// Load default cover art for this size
+		Image::Image image;
 
+		if (!image.load( Wt::WApplication::instance()->docRoot() + unknownCoverPath ))
+			throw std::runtime_error("Cannot read default cover file");
 
-		std::vector<unsigned char> data;
-		{
-			std::ifstream ist(Wt::WApplication::instance()->docRoot() + unknownCoverPath);
-			char c;
-			while(ist.get(c))
-				data.push_back(c);
-		}
+		image.scale(size);
 
-		CoverArt::CoverArt defaultCover(data);
-
-		defaultCover.scale(size);
-
-		auto res = _defaultCovers.insert(std::make_pair(size, defaultCover));
+		auto res = _defaultCovers.insert(std::make_pair(size, image));
 		itCover = res.first;
 	}
 
@@ -88,13 +81,13 @@ CoverResource::getUnknownTrackUrl(size_t size) const
 }
 
 void
-CoverResource::putCover(Wt::Http::Response& response, const CoverArt::CoverArt& cover)
+CoverResource::putCover(Wt::Http::Response& response, Image::Image cover)
 {
-	response.setMimeType( format_to_mimeType(CoverArt::Format::JPEG) );
-
 	std::vector<unsigned char> data;
-	cover.getData(data, CoverArt::Format::JPEG);
 
+	cover.save(data, Image::Format::JPEG);
+
+	response.setMimeType( Image::format_to_mimeType(Image::Format::JPEG) );
 	response.out().write(reinterpret_cast<const char *>(&data[0]), data.size());
 }
 
@@ -108,7 +101,7 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 
 	try
 	{
-		std::vector<CoverArt::CoverArt> covers;
+		std::vector<Image::Image> covers;
 
 		// Mandatory parameter size
 		if (!sizeStr)
@@ -144,17 +137,14 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 					covers = CoverArt::Grabber::instance().getFromTrack(path);
 					break;
 
-				case Database::Track::CoverType::ExternalFile:
-					covers = CoverArt::Grabber::instance().getFromDirectory(path.parent_path());
-					break;
-
 				case Database::Track::CoverType::None:
+					covers = CoverArt::Grabber::instance().getFromDirectory(path.parent_path());
 					break;
 			}
 		}
 		else if (releaseIdStr)
 		{
-			Database::Release::id_type releaseId = std::stol(*releaseIdStr); // TODO try catch
+			Database::Release::id_type releaseId = std::stol(*releaseIdStr);
 			// transactions are not thread safe
 			std::unique_lock<std::mutex> lock(_mutex);
 			Wt::Dbo::Transaction transaction(_db.getSession());
@@ -162,7 +152,7 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 			covers = CoverArt::Grabber::instance().getFromRelease(_db.getSession(), releaseId);
 		}
 
-		for (CoverArt::CoverArt& cover : covers)
+		for (Image::Image& cover : covers)
 		{
 			if (cover.scale(size))
 			{

src/ui/resource/CoverResource.hpp

@@ -25,7 +25,7 @@
 #include <Wt/WResource>
 
 #include "database/DatabaseHandler.hpp"
-#include "cover/CoverArt.hpp"
+#include "image/Image.hpp"
 
 namespace UserInterface {
 
@@ -47,14 +47,14 @@ class CoverResource : public Wt::WResource
 
 	private:
 
-		const CoverArt::CoverArt&	getDefaultCover(std::size_t size);
-		void				putCover(Wt::Http::Response& response, const CoverArt::CoverArt& cover);
+		const Image::Image&		getDefaultCover(std::size_t size);
+		void				putCover(Wt::Http::Response& response, Image::Image image);
 
 		std::mutex			_mutex;
 		Database::Handler&		_db;
 
 		// Default cover for different sizes
-		std::map<std::size_t, CoverArt::CoverArt>	_defaultCovers;
+		std::map<std::size_t, Image::Image>	_defaultCovers;
 
 		// TODO construct a cache for covers?
 };