WIP, Remote Client/Server, cover art for tracks, TBT

remote/messages/Header.hpp

@@ -10,14 +10,13 @@ namespace Remote
 class Header
 {
 	public:
+		static const std::size_t size = 8;	// HeaderSize
+		static const std::size_t max_data_size = 65536*64 - size;
 
-		static const std::size_t size = 8;
-
-		Header() : _size(0) {}
-
-		void setSize(std::size_t size)	{ _size = size; }
-		std::size_t getSize(void) const	{return _size;}
+		Header() : _dataSize(0) {}
 
+		void setDataSize(std::size_t size)	{ _dataSize = size; }
+		std::size_t getDataSize(void) const	{return _dataSize;}
 
 		bool from_istream(std::istream &is)
 		{
@@ -39,12 +38,12 @@ class Header
 			}
 			else
 			{
-				_size = decode32(&buffer[4]);
+				_dataSize = decode32(&buffer[4]);
 
-				if (_size > _maxSize)
-					std::cerr << "Header: msg too big (" << _size << ")!" << std::endl;
+				if (_dataSize > max_data_size)
+					std::cerr << "Header: msg too big (" << _dataSize << ")!" << std::endl;
 
-				return _size <= _maxSize;
+				return _dataSize <= max_data_size;
 			}
 		}
 
@@ -57,7 +56,7 @@ class Header
 		void to_buffer(std::array<unsigned char, size>& buffer) const
 		{
 			encode32(_magic, &buffer[0]);
-			encode32(_size, &buffer[4]);
+			encode32(_dataSize, &buffer[4]);
 		}
 
 	private:
@@ -78,9 +77,8 @@ class Header
 		}
 
 		static const uint32_t _magic = 0xdeadbeef;
-		static const uint32_t _maxSize = 65536*32;
 
-		uint32_t	_size;
+		uint32_t	_dataSize;
 };
 
 

remote/server/AudioCollectionRequestHandler.cpp

@@ -290,9 +290,25 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
 			break;
 
 		case AudioCollectionRequest::GetCoverArt::TypeGetCoverArtTrack:
-			std::cerr << "TODO AudioCollectionRequest::GetCoverArt::TypeGetCoverArtTrack" <<std::endl;
-			break;
+			if (request.has_track_id())
+			{
+				Wt::Dbo::Transaction transaction( _db.getSession() );
 
+				// Get the request release
+				Track::pointer track = Track::getById( _db.getSession(), request.track_id());
+
+				std::vector<CoverArt::CoverArt> coverArts = CoverArt::Grabber::getFromTrack(track);
+
+				BOOST_FOREACH(const CoverArt::CoverArt& coverArt, coverArts)
+				{
+					AudioCollectionResponse_CoverArt* cover_art = response.add_cover_art();
+
+					cover_art->set_mime_type(coverArt.getMimeType());
+					cover_art->set_data( std::string( coverArt.getData().begin(), coverArt.getData().end()) );
+				}
+			}
+			res = true;
+			break;
 	}
 
 	return res;

remote/server/Connection.cpp

@@ -84,11 +84,11 @@ Connection::handleReadHeader(const boost::system::error_code& error, std::size_t
 		}
 
 		// Now read the real message
-		boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getSize());
+		boost::asio::streambuf::mutable_buffers_type bufs = _inputStreamBuf.prepare(header.getDataSize());
 
 		boost::asio::async_read(_socket,
 				bufs,
-				boost::asio::transfer_exactly(header.getSize()),
+				boost::asio::transfer_exactly(header.getDataSize()),
 				boost::bind(&Connection::handleReadMsg, shared_from_this(),
 					boost::asio::placeholders::error,
 					boost::asio::placeholders::bytes_transferred));
@@ -138,10 +138,17 @@ Connection::handleReadMsg(const boost::system::error_code& error, std::size_t by
 				return;
 			}
 
+			if (_outputStreamBuf.size() >= Remote::Header::max_data_size)
+			{
+				std::cerr << "output message is too big! " << _outputStreamBuf.size() << " > " << Remote::Header::max_data_size << std::endl;
+				_connectionManager.stop(shared_from_this());
+				return;
+			}
+
 			std::array<unsigned char, Remote::Header::size> headerBuffer;
 			{
 				Remote::Header header;
-				header.setSize(_outputStreamBuf.size());
+				header.setDataSize(_outputStreamBuf.size());
 				header.to_buffer(headerBuffer);
 			}