[UI] Better handling covers: giving browsers a chance to properly cache them

src/ui/resource/CoverResource.cpp

@@ -19,6 +19,7 @@
 
 #include <boost/foreach.hpp>
 
+#include <Wt/WApplication>
 #include <Wt/Http/Response>
 
 #include "logger/Logger.hpp"
@@ -29,9 +30,9 @@
 
 namespace UserInterface {
 
-CoverResource::CoverResource(const boost::filesystem::path& path, std::size_t size, Wt::WObject *parent)
+CoverResource::CoverResource(Database::Handler& db, std::size_t size, Wt::WObject *parent)
 :  Wt::WResource(parent),
-_path(path),
+_db(db),
 _size(size)
 {
 }
@@ -45,25 +46,50 @@ CoverResource:: ~CoverResource()
 void
 CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response)
 {
-	if (_data.empty())
+	// Get the id of the track
+	const std::string *trackIdStr = request.getParameter("coverid");
+
+	if (trackIdStr)
 	{
-		std::vector<CoverArt::CoverArt> covers = CoverArt::Grabber::getFromTrack( _path );
+		Database::Track::id_type trackId;
+		{
+			std::istringstream iss(*trackIdStr); iss >> trackId;
+		}
+
+		Wt::Dbo::Transaction transaction(_db.getSession());
+
+		Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
+		std::vector<CoverArt::CoverArt> covers = CoverArt::Grabber::getFromTrack(track);
+
+		transaction.commit();
 
 		BOOST_FOREACH(CoverArt::CoverArt& cover, covers)
 		{
-			cover.scale(_size);
-			_data = cover.getData();
-			_mimeType = cover.getMimeType();
-			break;
+			if (cover.scale(_size))
+			{
+				response.setMimeType( cover.getMimeType() );
+
+				BOOST_FOREACH(unsigned char c, cover.getData())
+					response.out().put( c );
+
+				return;
+			}
+			else
+				LMS_LOG(MOD_UI, SEV_DEBUG) << "Resize error for track id = " << trackId;
 		}
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "no valid cover found for track id = " << trackId;
+		{
+			std::ifstream ist(Wt::WApplication::instance()->docRoot() + "/images/unknown-cover.jpg");
 
-		// TODO if not found fallback on an empty image
+			char c;
+			while(ist.get(c))
+				response.out().put( c );
+
+			response.setMimeType("image/jpeg");
+		}
 	}
-
-	response.setMimeType(_mimeType);
-
-	for (unsigned int i = 0; i < _data.size(); ++i)
-	        response.out().put(_data[i]);
+	else
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "no cover id parameter";
 }
 
 

src/ui/resource/CoverResource.hpp

@@ -17,11 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef COVER_RESOURCE_HPP_
+#define COVER_RESOURCE_HPP_
+
 #include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 
 #include <Wt/WResource>
 
+#include "database/DatabaseHandler.hpp"
 #include "database/AudioTypes.hpp"
 
 namespace UserInterface {
@@ -29,8 +33,8 @@ namespace UserInterface {
 class CoverResource : public Wt::WResource
 {
 	public:
-		CoverResource(const boost::filesystem::path& p,		// track to get cover from
-				std::size_t size,			// size * size pixels
+		CoverResource(Database::Handler& db,
+				std::size_t size,		// size * size pixels
 				Wt::WObject *parent = 0);
 		~CoverResource();
 
@@ -38,13 +42,10 @@ class CoverResource : public Wt::WResource
 
 	private:
 
-		boost::filesystem::path 	_path;
+		Database::Handler&		_db;
 		std::size_t			_size;
-		std::string			_mimeType;
-
-		std::vector<unsigned char>	_data;
 };
 
-
-
 } // namespace UserInterface
+
+#endif