Added helpers to simplify session data accesses. Made the CoverResource global to the session

src/ui/resource/CoverResource.cpp

@@ -30,26 +30,12 @@
 
 namespace UserInterface {
 
-CoverResource::CoverResource(Database::Handler& db, std::size_t size, Wt::WObject *parent)
+const std::string CoverResource::unknownCoverPath = "/images/unknown-cover.jpg";
+
+CoverResource::CoverResource(Database::Handler& db, Wt::WObject *parent)
 :  Wt::WResource(parent),
-_db(db),
-_size(size)
+_db(db)
 {
-	// Load default cover art
-
-	std::vector<unsigned char> data;
-
-	{
-		std::ifstream ist(Wt::WApplication::instance()->docRoot() + "/images/unknown-cover.jpg");
-		char c;
-		while(ist.get(c))
-			data.push_back(c);
-	}
-
-	_defaultCover.setData(data);
-	_defaultCover.setMimeType("image/jpeg");
-
-	_defaultCover.scale(size);
 }
 
 CoverResource:: ~CoverResource()
@@ -57,16 +43,59 @@ CoverResource:: ~CoverResource()
 	beingDeleted();
 }
 
-std::string
-CoverResource::getReleaseUrl(std::string releaseName)
+const CoverArt::CoverArt&
+CoverResource::getDefaultCover(std::size_t size)
 {
-	return url() +  "&release=" + releaseName;
+	auto itCover = _defaultCovers.find(size);
+	if (itCover == _defaultCovers.end())
+	{
+		// Load default cover art for this size
+
+		CoverArt::CoverArt defaultCover;
+
+		std::vector<unsigned char> data;
+		{
+			std::ifstream ist(Wt::WApplication::instance()->docRoot() + unknownCoverPath);
+			char c;
+			while(ist.get(c))
+				data.push_back(c);
+		}
+
+		defaultCover.setData(data);
+		defaultCover.setMimeType("image/jpeg");
+		defaultCover.scale(size);
+
+		auto res = _defaultCovers.insert(std::make_pair(size, defaultCover));
+		itCover = res.first;
+	}
+
+	return itCover->second;
 }
 
 std::string
-CoverResource::getTrackUrl(Database::Track::id_type trackId)
+CoverResource::getReleaseUrl(std::string releaseName, std::size_t size) const
 {
-	return url()+ "&trackid=" + std::to_string(trackId);
+	return url() +  "&release=" + releaseName + "&size=" + std::to_string(size);
+}
+
+std::string
+CoverResource::getTrackUrl(Database::Track::id_type trackId, std::size_t size) const
+{
+	return url()+ "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(size);
+}
+
+std::string
+CoverResource::getUnkownTrackUrl(size_t size) const
+{
+	return Wt::WApplication::instance()->docRoot() + unknownCoverPath + "&size=" + std::to_string(size);
+}
+
+void
+CoverResource::putCover(Wt::Http::Response& response, const CoverArt::CoverArt& cover)
+{
+	response.setMimeType( cover.getMimeType() );
+	BOOST_FOREACH(unsigned char c, cover.getData())
+		response.out().put( c );
 }
 
 void
@@ -75,15 +104,24 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 
 	// Get the id of the track
 	const std::string *trackIdStr = request.getParameter("trackid");
+	const std::string *sizeStr = request.getParameter("size");
 	const std::string *releaseStr = request.getParameter("release");
 
 	std::vector<CoverArt::CoverArt> covers;
 
+	// Mandatory parameter size
+	if (!sizeStr)
+		return;
+
+	std::size_t size = std::stol(*sizeStr);
+	if (size > maxSize)
+		return;
+
 	if (trackIdStr)
 	{
 		Database::Track::id_type trackId = std::stol(*trackIdStr);
 		std::string path;
-		bool hasCover = false;;
+		bool hasCover = false;
 
 		{
 			// transactions are not thread safe
@@ -94,15 +132,13 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 			Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
 			if (track)
 			{
-				hasCover = track->hasCover();;
+				hasCover = track->hasCover();
 				path = track->getPath();
 			}
 		}
 
 		if (hasCover)
-		{
 			covers = CoverArt::Grabber::getFromTrack(path);
-		}
 	}
 	else if (releaseStr)
 	{
@@ -115,22 +151,15 @@ CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 
 	BOOST_FOREACH(CoverArt::CoverArt& cover, covers)
 	{
-		if (cover.scale(_size))
+		if (cover.scale(size))
 		{
-			response.setMimeType( cover.getMimeType() );
-
-			BOOST_FOREACH(unsigned char c, cover.getData())
-				response.out().put( c );
-
+			putCover(response, cover);
 			return;
 		}
 	}
 
 	// If no cover found, just send default one
-	response.setMimeType( _defaultCover.getMimeType() );
-	BOOST_FOREACH(unsigned char c, _defaultCover.getData())
-		response.out().put( c );
-
+	putCover(response, getDefaultCover(size));
 }
 
 } // namespace UserInterface