[UI] First working mobile version

src/ui/resource/AvConvTranscodeStreamResource.cpp

@@ -44,11 +44,11 @@ void
 AvConvTranscodeStreamResource::handleRequest(const Wt::Http::Request& request,
 		Wt::Http::Response& response)
 {
-	static const std::size_t chunkSize = 8192; // TODO parametrize?
-
 	// see if this request is for a continuation:
 	Wt::Http::ResponseContinuation *continuation = request.continuation();
 
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Handling new request. Continuation = " << std::boolalpha << continuation;
+
 	std::shared_ptr<Transcode::AvConvTranscoder> transcoder;
 	if (continuation)
 		transcoder = boost::any_cast<std::shared_ptr<Transcode::AvConvTranscoder> >(continuation->data());
@@ -65,13 +65,15 @@ AvConvTranscodeStreamResource::handleRequest(const Wt::Http::Request& request,
 	if (!transcoder->isComplete())
 	{
 		std::vector<unsigned char> data;
-		data.reserve(chunkSize);
+		data.reserve(_bufferSize);
 
-		transcoder->process(data, chunkSize);
+		transcoder->process(data, _bufferSize);
 
 		// Give the client all the output data
 		response.out().write(reinterpret_cast<char*>(&data[0]), data.size());
 
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "Written " << data.size() << " bytes! complete = " << std::boolalpha << transcoder->isComplete() << ", produced bytes = " << transcoder->getOutputBytes();
+
 		if (!response.out())
 			LMS_LOG(MOD_UI, SEV_ERROR) << "Write failed!";
 	}

src/ui/resource/CoverResource.cpp

@@ -35,6 +35,21 @@ CoverResource::CoverResource(Database::Handler& db, std::size_t size, Wt::WObjec
 _db(db),
 _size(size)
 {
+	// 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()
@@ -42,55 +57,66 @@ CoverResource:: ~CoverResource()
 	beingDeleted();
 }
 
+std::string
+CoverResource::getReleaseUrl(std::string releaseName)
+{
+	return url() +  "&release=" + releaseName;
+}
+
+std::string
+CoverResource::getTrackUrl(Database::Track::id_type trackId)
+{
+	return url()+ "&trackid=" + std::to_string(trackId);
+}
 
 void
 CoverResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response)
 {
 	// Get the id of the track
-	const std::string *trackIdStr = request.getParameter("coverid");
+	const std::string *trackIdStr = request.getParameter("trackid");
+	const std::string *releaseStr = request.getParameter("release");
+
+	std::vector<CoverArt::CoverArt> covers;
 
 	if (trackIdStr)
 	{
 		Database::Track::id_type trackId;
 		{
-			std::istringstream iss(*trackIdStr); iss >> 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);
+		covers = CoverArt::Grabber::getFromTrack(track);
 
 		transaction.commit();
+	}
+	else if (releaseStr)
+	{
+		Wt::Dbo::Transaction transaction(_db.getSession());
+		covers = CoverArt::Grabber::getFromRelease(_db.getSession(), *releaseStr);
+	}
 
-		BOOST_FOREACH(CoverArt::CoverArt& cover, covers)
+	BOOST_FOREACH(CoverArt::CoverArt& cover, covers)
+	{
+		if (cover.scale(_size))
 		{
-			if (cover.scale(_size))
-			{
-				response.setMimeType( cover.getMimeType() );
+			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");
-
-			char c;
-			while(ist.get(c))
+			BOOST_FOREACH(unsigned char c, cover.getData())
 				response.out().put( c );
 
-			response.setMimeType("image/jpeg");
+			return;
 		}
 	}
-	else
-		LMS_LOG(MOD_UI, SEV_DEBUG) << "no cover id parameter";
+
+	// If no cover found, just send default one
+	response.setMimeType( _defaultCover.getMimeType() );
+	BOOST_FOREACH(unsigned char c, _defaultCover.getData())
+		response.out().put( c );
+
 }
 
-
 } // namespace UserInterface

src/ui/resource/CoverResource.hpp

@@ -26,6 +26,7 @@
 #include <Wt/WResource>
 
 #include "database/DatabaseHandler.hpp"
+#include "cover/CoverArt.hpp"
 
 namespace UserInterface {
 
@@ -37,12 +38,16 @@ class CoverResource : public Wt::WResource
 				Wt::WObject *parent = 0);
 		~CoverResource();
 
+		std::string getReleaseUrl(std::string releaseName);
+		std::string getTrackUrl(Database::Track::id_type trackId);
+
 		void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response);
 
 	private:
 
 		Database::Handler&		_db;
 		std::size_t			_size;
+		CoverArt::CoverArt		_defaultCover;
 };
 
 } // namespace UserInterface